diff --git a/Cargo.lock b/Cargo.lock
index 4e8a94ecd2059..d6f49292d22a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -298,7 +298,7 @@ dependencies = [
  "aptos-crypto-derive",
  "aptos-workspace-hack",
  "bcs",
- "bitvec 0.19.6",
+ "bitvec",
  "byteorder",
  "bytes",
  "criterion",
@@ -319,7 +319,7 @@ dependencies = [
  "serde_bytes",
  "serde_json",
  "sha2",
- "sha3 0.9.1",
+ "sha3",
  "static_assertions",
  "thiserror",
  "tiny-keccak",
@@ -1192,7 +1192,10 @@ version = "0.1.0"
 dependencies = [
  "Inflector",
  "anyhow",
+ "arrayvec",
  "backtrace",
+ "block-buffer 0.9.0",
+ "bstr",
  "byteorder",
  "bytes",
  "cc",
@@ -1214,6 +1217,7 @@ dependencies = [
  "hashbrown 0.11.2",
  "hyper",
  "include_dir 0.7.2",
+ "indexmap",
  "itertools",
  "libc",
  "log",
@@ -1222,10 +1226,9 @@ dependencies = [
  "num-traits 0.2.14",
  "parking_lot 0.12.0",
  "phf_shared",
- "plotters",
  "rand 0.8.4",
  "regex",
- "regex-automata",
+ "regex-syntax",
  "reqwest",
  "rusty-fork",
  "serde 1.0.136",
@@ -1237,6 +1240,7 @@ dependencies = [
  "tokio",
  "tokio-util 0.6.9",
  "tracing",
+ "tracing-core",
  "warp",
  "zeroize",
 ]
@@ -1345,12 +1349,6 @@ 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 = "assert_approx_eq"
 version = "1.1.0"
@@ -1410,18 +1408,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "auto_impl"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7862e21c893d65a1650125d157eaeec691439379a1cee17ee49031b79236ada4"
-dependencies = [
- "proc-macro-error",
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.91",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.0.1"
@@ -1636,19 +1622,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33"
 dependencies = [
  "funty",
- "radium 0.5.3",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "bitvec"
-version = "0.20.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848"
-dependencies = [
- "funty",
- "radium 0.6.2",
+ "radium",
  "tap",
  "wyz",
 ]
@@ -1736,12 +1710,6 @@ version = "3.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
 
-[[package]]
-name = "byte-slice-cast"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e"
-
 [[package]]
 name = "byte-tools"
 version = "0.3.1"
@@ -1751,14 +1719,13 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 [[package]]
 name = "bytecode-interpreter-crypto"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "curve25519-dalek-fiat",
  "ed25519-dalek-fiat",
  "sha2",
- "sha3 0.9.1",
- "workspace-hack",
+ "sha3",
 ]
 
 [[package]]
@@ -2650,17 +2617,6 @@ dependencies = [
  "warp",
 ]
 
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.91",
-]
-
 [[package]]
 name = "determinator"
 version = "0.8.0"
@@ -2697,7 +2653,7 @@ dependencies = [
  "diesel_derives",
  "num-bigint 0.2.6",
  "num-integer",
- "num-traits 0.1.43",
+ "num-traits 0.2.14",
  "pq-sys",
  "r2d2",
  "serde_json",
@@ -2794,15 +2750,6 @@ dependencies = [
  "dirs-sys",
 ]
 
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys",
-]
-
 [[package]]
 name = "dirs-next"
 version = "2.0.0"
@@ -2847,12 +2794,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "31ad93652f40969dead8d4bf897a41e9462095152eb21c56e5830537e41179dd"
 
-[[package]]
-name = "downcast-rs"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
-
 [[package]]
 name = "dtoa"
 version = "0.4.8"
@@ -2969,12 +2910,6 @@ dependencies = [
  "termcolor",
 ]
 
-[[package]]
-name = "environmental"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797"
-
 [[package]]
 name = "erased-serde"
 version = "0.3.20"
@@ -2984,54 +2919,6 @@ dependencies = [
  "serde 1.0.136",
 ]
 
-[[package]]
-name = "ethbloom"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8"
-dependencies = [
- "crunchy",
- "fixed-hash",
- "impl-codec",
- "impl-rlp",
- "scale-info",
- "tiny-keccak",
-]
-
-[[package]]
-name = "ethereum"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34c90e0a755da706ce0970ec0fa8cc48aabcc8e8efa1245336acf718dab06ffe"
-dependencies = [
- "bytes",
- "ethereum-types",
- "hash-db",
- "hash256-std-hasher",
- "parity-scale-codec",
- "rlp",
- "rlp-derive",
- "scale-info",
- "serde 1.0.136",
- "sha3 0.9.1",
- "triehash",
-]
-
-[[package]]
-name = "ethereum-types"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf"
-dependencies = [
- "ethbloom",
- "fixed-hash",
- "impl-codec",
- "impl-rlp",
- "primitive-types",
- "scale-info",
- "uint",
-]
-
 [[package]]
 name = "ethnum"
 version = "1.1.1"
@@ -3063,81 +2950,6 @@ dependencies = [
  "vm-genesis",
 ]
 
-[[package]]
-name = "evm"
-version = "0.33.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "408ffdd509e16de15ea9b51f5333748f6086601f29d445d2ba53dd7e95565574"
-dependencies = [
- "auto_impl",
- "environmental",
- "ethereum",
- "evm-core",
- "evm-gasometer",
- "evm-runtime",
- "log",
- "parity-scale-codec",
- "primitive-types",
- "rlp",
- "scale-info",
- "serde 1.0.136",
- "sha3 0.8.2",
-]
-
-[[package]]
-name = "evm-core"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dfe4f2a56c4c05a8107b8596380e2332fc2019ffcf56b8f2d01971393a30c4d"
-dependencies = [
- "funty",
- "parity-scale-codec",
- "primitive-types",
- "scale-info",
- "serde 1.0.136",
-]
-
-[[package]]
-name = "evm-exec-utils"
-version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
-dependencies = [
- "anyhow",
- "dirs",
- "evm",
- "evm-runtime",
- "hex",
- "move-command-line-common",
- "primitive-types",
- "sha3 0.9.1",
- "tempfile",
- "workspace-hack",
-]
-
-[[package]]
-name = "evm-gasometer"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c446679607eacac4e8c8738e20c97ea9b3c86eddd8b43666744b05f416037bd9"
-dependencies = [
- "environmental",
- "evm-core",
- "evm-runtime",
- "primitive-types",
-]
-
-[[package]]
-name = "evm-runtime"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "419e8434ac6e850a8a4bc09a19406264582d1940913b2920be2af948f4ffc49b"
-dependencies = [
- "environmental",
- "evm-core",
- "primitive-types",
- "sha3 0.8.2",
-]
-
 [[package]]
 name = "executor"
 version = "0.1.0"
@@ -3287,18 +3099,6 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35354cf6bf9d259374646f419a25c7dd0bb208d291e44dc73db557542fe017fc"
 
-[[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.4",
- "rustc-hex",
- "static_assertions",
-]
-
 [[package]]
 name = "fixedbitset"
 version = "0.2.0"
@@ -3823,21 +3623,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "hash-db"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a"
-
-[[package]]
-name = "hash256-std-hasher"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92c171d55b98633f4ed3860808f004099b36c1cc29c42cfc53aa8591b21efcf2"
-dependencies = [
- "crunchy",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.11.2"
@@ -4123,35 +3908,6 @@ dependencies = [
  "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-rlp"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
-dependencies = [
- "rlp",
-]
-
-[[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.37",
- "quote 1.0.18",
- "syn 1.0.91",
-]
-
 [[package]]
 name = "include_dir"
 version = "0.6.2"
@@ -4494,7 +4250,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
 dependencies = [
- "arrayvec 0.5.2",
+ "arrayvec",
  "bitflags",
  "cfg-if 1.0.0",
  "ryu",
@@ -4736,7 +4492,7 @@ checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
 [[package]]
 name = "move-abigen"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4747,13 +4503,12 @@ dependencies = [
  "move-core-types",
  "move-model",
  "serde 1.0.136",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-binary-format"
 version = "0.0.3"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "mirai-annotations",
@@ -4764,52 +4519,47 @@ dependencies = [
  "ref-cast",
  "serde 1.0.136",
  "variant_count",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-borrow-graph"
 version = "0.0.1"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "mirai-annotations",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-bytecode-source-map"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "bcs",
- "codespan-reporting",
  "move-binary-format",
  "move-command-line-common",
  "move-core-types",
  "move-ir-types",
  "move-symbol-pool",
  "serde 1.0.136",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-bytecode-utils"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "move-binary-format",
  "move-core-types",
  "petgraph 0.5.1",
  "serde-reflection 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-bytecode-verifier"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "mirai-annotations",
@@ -4817,13 +4567,12 @@ dependencies = [
  "move-borrow-graph",
  "move-core-types",
  "petgraph 0.5.1",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-bytecode-viewer"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "clap 3.1.9",
@@ -4835,13 +4584,12 @@ dependencies = [
  "move-ir-types",
  "regex",
  "tui",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-cli"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4849,7 +4597,6 @@ dependencies = [
  "codespan-reporting",
  "colored",
  "difference",
- "include_dir 0.6.2",
  "itertools",
  "move-binary-format",
  "move-bytecode-source-map",
@@ -4878,13 +4625,12 @@ dependencies = [
  "serde_yaml",
  "tempfile",
  "walkdir",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-command-line-common"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "difference",
@@ -4892,13 +4638,12 @@ dependencies = [
  "serde 1.0.136",
  "sha2",
  "walkdir",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-compiler"
 version = "0.0.1"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4919,16 +4664,15 @@ dependencies = [
  "once_cell",
  "petgraph 0.5.1",
  "regex",
- "sha3 0.9.1",
+ "sha3",
  "tempfile",
  "walkdir",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-core-types"
 version = "0.0.3"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4941,13 +4685,12 @@ dependencies = [
  "ref-cast",
  "serde 1.0.136",
  "serde_bytes",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-coverage"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4956,20 +4699,18 @@ dependencies = [
  "colored",
  "move-binary-format",
  "move-bytecode-source-map",
- "move-bytecode-verifier",
  "move-command-line-common",
  "move-core-types",
  "move-ir-types",
  "once_cell",
  "petgraph 0.5.1",
  "serde 1.0.136",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-disassembler"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "clap 3.1.9",
@@ -4982,13 +4723,12 @@ dependencies = [
  "move-core-types",
  "move-coverage",
  "move-ir-types",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-docgen"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "codespan",
@@ -4997,18 +4737,16 @@ dependencies = [
  "log",
  "move-compiler",
  "move-model",
- "move-stackless-bytecode",
  "num",
  "once_cell",
  "regex",
  "serde 1.0.136",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-errmapgen"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "bcs",
@@ -5017,7 +4755,6 @@ dependencies = [
  "move-core-types",
  "move-model",
  "serde 1.0.136",
- "workspace-hack",
 ]
 
 [[package]]
@@ -5038,7 +4775,7 @@ dependencies = [
 [[package]]
 name = "move-ir-compiler"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "bcs",
@@ -5052,13 +4789,12 @@ dependencies = [
  "move-ir-types",
  "move-symbol-pool",
  "serde_json",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-ir-to-bytecode"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "codespan-reporting",
@@ -5072,13 +4808,12 @@ dependencies = [
  "move-symbol-pool",
  "ouroboros",
  "thiserror",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-ir-to-bytecode-syntax"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "hex",
@@ -5086,13 +4821,12 @@ dependencies = [
  "move-core-types",
  "move-ir-types",
  "move-symbol-pool",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-ir-types"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "hex",
@@ -5101,13 +4835,12 @@ dependencies = [
  "move-symbol-pool",
  "once_cell",
  "serde 1.0.136",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-model"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "codespan",
@@ -5128,20 +4861,17 @@ dependencies = [
  "once_cell",
  "regex",
  "serde 1.0.136",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-package"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "bcs",
  "clap 3.1.9",
  "colored",
- "evm-exec-utils",
- "hex",
  "move-abigen",
  "move-binary-format",
  "move-bytecode-source-map",
@@ -5150,10 +4880,8 @@ dependencies = [
  "move-compiler",
  "move-core-types",
  "move-docgen",
- "move-errmapgen",
  "move-model",
  "move-symbol-pool",
- "move-to-yul",
  "named-lock",
  "once_cell",
  "petgraph 0.5.1",
@@ -5163,16 +4891,14 @@ dependencies = [
  "serde_yaml",
  "sha2",
  "tempfile",
- "termcolor",
  "toml",
  "walkdir",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-prover"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5195,7 +4921,6 @@ dependencies = [
  "move-model",
  "move-prover-boogie-backend",
  "move-stackless-bytecode",
- "move-stackless-bytecode-interpreter",
  "num",
  "once_cell",
  "pretty",
@@ -5205,13 +4930,12 @@ dependencies = [
  "simplelog",
  "tokio",
  "toml",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-prover-boogie-backend"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5234,41 +4958,37 @@ dependencies = [
  "serde_json",
  "tera",
  "tokio",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-read-write-set-types"
 version = "0.0.3"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "move-binary-format",
  "move-core-types",
  "serde 1.0.136",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-resource-viewer"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "bcs",
  "hex",
  "move-binary-format",
  "move-core-types",
- "move-vm-types",
  "once_cell",
  "serde 1.0.136",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-stackless-bytecode"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "codespan",
  "codespan-reporting",
@@ -5289,14 +5009,12 @@ dependencies = [
  "paste",
  "petgraph 0.5.1",
  "serde 1.0.136",
- "serde_json",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-stackless-bytecode-interpreter"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "bytecode-interpreter-crypto",
@@ -5307,16 +5025,14 @@ dependencies = [
  "move-core-types",
  "move-model",
  "move-stackless-bytecode",
- "move-vm-runtime",
  "num",
  "serde 1.0.136",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-stdlib"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "log",
  "move-binary-format",
@@ -5329,87 +5045,41 @@ dependencies = [
  "move-vm-runtime",
  "move-vm-types",
  "sha2",
- "sha3 0.9.1",
+ "sha3",
  "smallvec",
  "walkdir",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-symbol-pool"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "once_cell",
  "serde 1.0.136",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-table-extension"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "bcs",
  "better_any",
- "downcast-rs",
- "itertools",
  "move-binary-format",
- "move-command-line-common",
- "move-compiler",
  "move-core-types",
  "move-vm-runtime",
  "move-vm-types",
  "once_cell",
- "sha3 0.9.1",
+ "sha3",
  "smallvec",
- "walkdir",
- "workspace-hack",
-]
-
-[[package]]
-name = "move-to-yul"
-version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
-dependencies = [
- "anyhow",
- "atty",
- "clap 3.1.9",
- "codespan",
- "codespan-reporting",
- "ethnum",
- "evm",
- "hex",
- "itertools",
- "log",
- "maplit",
- "move-binary-format",
- "move-command-line-common",
- "move-compiler",
- "move-core-types",
- "move-ir-types",
- "move-model",
- "move-prover-boogie-backend",
- "move-stackless-bytecode",
- "num",
- "once_cell",
- "pretty",
- "primitive-types",
- "rand 0.8.4",
- "regex",
- "serde 1.0.136",
- "serde_json",
- "sha3 0.9.1",
- "simplelog",
- "toml",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-transactional-test-runner"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "clap 3.1.9",
@@ -5435,20 +5105,17 @@ dependencies = [
  "rayon",
  "regex",
  "tempfile",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-unit-test"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "clap 3.1.9",
  "codespan-reporting",
  "colored",
- "evm",
- "evm-exec-utils",
  "itertools",
  "move-binary-format",
  "move-bytecode-utils",
@@ -5462,21 +5129,18 @@ dependencies = [
  "move-stdlib",
  "move-symbol-pool",
  "move-table-extension",
- "move-to-yul",
  "move-vm-runtime",
  "move-vm-test-utils",
  "move-vm-types",
  "once_cell",
- "primitive-types",
  "rayon",
  "regex",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-vm-runtime"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "better_any",
  "fail",
@@ -5487,27 +5151,23 @@ dependencies = [
  "move-vm-types",
  "once_cell",
  "parking_lot 0.11.2",
- "sha3 0.9.1",
+ "sha3",
  "tracing",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-vm-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
- "move-binary-format",
  "move-core-types",
- "move-vm-runtime",
- "workspace-hack",
 ]
 
 [[package]]
 name = "move-vm-types"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "bcs",
  "mirai-annotations",
@@ -5516,9 +5176,7 @@ dependencies = [
  "once_cell",
  "proptest",
  "serde 1.0.136",
- "sha2",
  "smallvec",
- "workspace-hack",
 ]
 
 [[package]]
@@ -6054,32 +5712,6 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e72e30578e0d0993c8ae20823dd9cff2bc5517d2f586a8aef462a581e8a03eb"
 
-[[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 0.20.4",
- "byte-slice-cast",
- "impl-trait-for-tuples",
- "parity-scale-codec-derive",
- "serde 1.0.136",
-]
-
-[[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.37",
- "quote 1.0.18",
- "syn 1.0.91",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.10.2"
@@ -6399,33 +6031,10 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad9940b913ee56ddd94aec2d3cd179dd47068236f42a1a6415ccf9d880ce2a61"
 dependencies = [
- "arrayvec 0.5.2",
+ "arrayvec",
  "typed-arena",
 ]
 
-[[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-rlp",
- "scale-info",
- "uint",
-]
-
-[[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"
@@ -6643,12 +6252,6 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
 
-[[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"
@@ -6775,7 +6378,7 @@ dependencies = [
 [[package]]
 name = "read-write-set"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "move-binary-format",
@@ -6783,23 +6386,20 @@ dependencies = [
  "move-core-types",
  "move-model",
  "move-read-write-set-types",
- "move-resource-viewer",
  "move-stackless-bytecode",
  "read-write-set-dynamic",
- "workspace-hack",
 ]
 
 [[package]]
 name = "read-write-set-dynamic"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
+source = "git+https://github.com/move-language/move?rev=6a80792ecbf16d74bf1d57e48a576377f0879646#6a80792ecbf16d74bf1d57e48a576377f0879646"
 dependencies = [
  "anyhow",
  "move-binary-format",
  "move-bytecode-utils",
  "move-core-types",
  "move-read-write-set-types",
- "workspace-hack",
 ]
 
 [[package]]
@@ -6873,9 +6473,6 @@ 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"
@@ -6958,27 +6555,6 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
-[[package]]
-name = "rlp"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5"
-dependencies = [
- "bytes",
- "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.37",
- "quote 1.0.18",
- "syn 1.0.91",
-]
-
 [[package]]
 name = "rocksdb"
 version = "0.17.0"
@@ -7105,12 +6681,6 @@ 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.2.3"
@@ -7204,31 +6774,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "scale-info"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f"
-dependencies = [
- "bitvec 0.20.4",
- "cfg-if 1.0.0",
- "derive_more",
- "parity-scale-codec",
- "scale-info-derive",
-]
-
-[[package]]
-name = "scale-info-derive"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.91",
-]
-
 [[package]]
 name = "schannel"
 version = "0.1.19"
@@ -7286,7 +6831,7 @@ dependencies = [
  "aptos-types",
  "aptos-workspace-hack",
  "arc-swap",
- "bitvec 0.19.6",
+ "bitvec",
  "criterion",
  "itertools",
  "once_cell",
@@ -7625,19 +7170,6 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
-[[package]]
-name = "sha3"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
-dependencies = [
- "block-buffer 0.7.3",
- "byte-tools",
- "digest 0.8.1",
- "keccak",
- "opaque-debug 0.2.3",
-]
-
 [[package]]
 name = "sha3"
 version = "0.9.1"
@@ -8822,16 +8354,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "triehash"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1631b201eb031b563d2e85ca18ec8092508e262a3196ce9bd10a67ec87b9f5c"
-dependencies = [
- "hash-db",
- "rlp",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.3"
@@ -8922,18 +8444,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
 
-[[package]]
-name = "uint"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
-dependencies = [
- "byteorder",
- "crunchy",
- "hex",
- "static_assertions",
-]
-
 [[package]]
 name = "uncased"
 version = "0.9.6"
@@ -9205,7 +8715,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983"
 dependencies = [
- "arrayvec 0.5.2",
+ "arrayvec",
  "utf8parse",
  "vte_generate_state_changes",
 ]
@@ -9491,48 +9001,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "workspace-hack"
-version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=43f1e151dea91ca8e8c7644557e55b8f456fbb65#43f1e151dea91ca8e8c7644557e55b8f456fbb65"
-dependencies = [
- "arrayvec 0.5.2",
- "block-buffer 0.9.0",
- "bstr",
- "byteorder",
- "bytes",
- "clap 2.34.0",
- "clap 3.1.9",
- "codespan-reporting",
- "crossbeam-utils",
- "crunchy",
- "evm",
- "evm-gasometer",
- "evm-runtime",
- "getrandom 0.2.6",
- "hex",
- "indexmap",
- "libc",
- "log",
- "memchr",
- "mio 0.7.14",
- "num-traits 0.2.14",
- "plotters",
- "primitive-types",
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "rand_core 0.5.1",
- "regex",
- "regex-automata",
- "regex-syntax",
- "serde 1.0.136",
- "sha3 0.9.1",
- "syn 0.15.44",
- "syn 1.0.91",
- "tiny-keccak",
- "tracing-core",
-]
-
 [[package]]
 name = "wyz"
 version = "0.2.0"
diff --git a/api/Cargo.toml b/api/Cargo.toml
index 91c5070f8706f..bd5ea0eb6efc2 100644
--- a/api/Cargo.toml
+++ b/api/Cargo.toml
@@ -35,8 +35,8 @@ aptos-vm = { path = "../aptos-move/aptos-vm" }
 aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" }
 aptos-api-types = { path = "./types", package = "aptos-api-types" }
 storage-interface = { path = "../storage/storage-interface" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-resource-viewer = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-resource-viewer = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 
 [dev-dependencies]
 goldenfile = "1.1.0"
diff --git a/api/types/Cargo.toml b/api/types/Cargo.toml
index 569d2aa4a98ef..6f95e7b264000 100644
--- a/api/types/Cargo.toml
+++ b/api/types/Cargo.toml
@@ -23,9 +23,9 @@ aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
 aptos-types = { path = "../../types" }
 aptos-vm = { path = "../../aptos-move/aptos-vm" }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-resource-viewer = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-resource-viewer = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 
 [dev-dependencies]
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
diff --git a/api/types/src/address.rs b/api/types/src/address.rs
index 4640b715439cb..375c1599f319c 100644
--- a/api/types/src/address.rs
+++ b/api/types/src/address.rs
@@ -112,10 +112,7 @@ mod tests {
         let address: Address = serde_json::from_value(json!("0x1")).unwrap();
 
         let account_address: AccountAddress = address.into();
-        assert_eq!(
-            account_address.short_str_lossless().as_str(),
-            AccountAddress::ONE.to_hex().as_str()
-        );
+        assert_eq!(account_address, AccountAddress::ONE);
 
         let new_address: Address = account_address.into();
         assert_eq!(new_address, address);
@@ -126,10 +123,7 @@ mod tests {
         let address: Address = serde_json::from_value(json!("0x1")).unwrap();
 
         let account_address: AccountAddress = (&address).into();
-        assert_eq!(
-            account_address.short_str_lossless().as_str(),
-            AccountAddress::ONE.to_hex().as_str()
-        );
+        assert_eq!(account_address, AccountAddress::ONE);
 
         let new_address: Address = account_address.into();
         assert_eq!(new_address, address);
diff --git a/aptos-move/af-cli/Cargo.toml b/aptos-move/af-cli/Cargo.toml
index dc48ae1b55a34..c1e32433ae8a7 100644
--- a/aptos-move/af-cli/Cargo.toml
+++ b/aptos-move/af-cli/Cargo.toml
@@ -17,9 +17,9 @@ clap = "3.1.8"
 aptos-vm = { path = "../aptos-vm" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 cached-framework-packages =  { path = "../framework/cached-packages" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-cli = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-cli = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 
 [dev-dependencies]
 datatest-stable = "0.1.1"
diff --git a/aptos-move/aptos-resource-viewer/Cargo.toml b/aptos-move/aptos-resource-viewer/Cargo.toml
index 9f5538f5b1e32..80f3c2a688ca9 100644
--- a/aptos-move/aptos-resource-viewer/Cargo.toml
+++ b/aptos-move/aptos-resource-viewer/Cargo.toml
@@ -11,9 +11,9 @@ edition = "2018"
 
 [dependencies]
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
-move-resource-viewer = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-resource-viewer = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 aptos-types = { path = "../../types"  }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 
 anyhow = "1.0.52"
diff --git a/aptos-move/aptos-transaction-benchmarks/Cargo.toml b/aptos-move/aptos-transaction-benchmarks/Cargo.toml
index c4e2b51e82e45..1933b84ad5aa3 100644
--- a/aptos-move/aptos-transaction-benchmarks/Cargo.toml
+++ b/aptos-move/aptos-transaction-benchmarks/Cargo.toml
@@ -19,8 +19,8 @@ language-e2e-tests = { path = "../e2e-tests" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 aptos-crypto = { path = "../../crates/aptos-crypto" }
 
-read-write-set = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+read-write-set = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 aptos-vm = { path = "../aptos-vm" }
 
 [[bench]]
diff --git a/aptos-move/aptos-transactional-test-harness/Cargo.toml b/aptos-move/aptos-transactional-test-harness/Cargo.toml
index 415b248857af2..424dfd896f988 100644
--- a/aptos-move/aptos-transactional-test-harness/Cargo.toml
+++ b/aptos-move/aptos-transactional-test-harness/Cargo.toml
@@ -19,12 +19,12 @@ bcs = "0.1.2"
 hex = "0.4.3"
 
 # Move dependencies
-move-transactional-test-runner = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-command-line-common = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-transactional-test-runner = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-compiler = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-command-line-common = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 
 
 # Diem-Move dependencies
diff --git a/aptos-move/aptos-validator-interface/Cargo.toml b/aptos-move/aptos-validator-interface/Cargo.toml
index a4c87c09201bd..e6ddb7077eb37 100644
--- a/aptos-move/aptos-validator-interface/Cargo.toml
+++ b/aptos-move/aptos-validator-interface/Cargo.toml
@@ -17,4 +17,4 @@ aptosdb = { path = "../../storage/aptosdb" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 storage-interface = { path = "../../storage/storage-interface" }
 aptos-state-view = { path = "../../storage/state-view" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
diff --git a/aptos-move/aptos-vm/Cargo.toml b/aptos-move/aptos-vm/Cargo.toml
index e5133b7b6e24e..30a14828126ec 100644
--- a/aptos-move/aptos-vm/Cargo.toml
+++ b/aptos-move/aptos-vm/Cargo.toml
@@ -18,14 +18,14 @@ once_cell = "1.7.2"
 rayon = "1.5.0"
 tracing = "0.1.16"
 
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-stdlib = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-table-extension = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65"}
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-stdlib = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-table-extension = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646"}
 
 aptos-crypto = { path = "../../crates/aptos-crypto" }
 aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive" }
diff --git a/aptos-move/e2e-tests-replay/Cargo.toml b/aptos-move/e2e-tests-replay/Cargo.toml
index b6108e1c56f22..c6df7bf67b062 100644
--- a/aptos-move/e2e-tests-replay/Cargo.toml
+++ b/aptos-move/e2e-tests-replay/Cargo.toml
@@ -14,13 +14,13 @@ structopt = "0.3.21"
 walkdir = "2.3.1"
 
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
-move-stackless-bytecode-interpreter = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-stackless-bytecode-interpreter = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 aptos-types = { path = "../../types", features = ["fuzzing"] }
 framework =  { path = "../framework" }
 aptos-vm = { path = "../../aptos-move/aptos-vm" }
 language-e2e-tests = { path = "../e2e-tests" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-model = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-model = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
diff --git a/aptos-move/e2e-tests/Cargo.toml b/aptos-move/e2e-tests/Cargo.toml
index 551c2a1777ae5..7de88d38a74a1 100644
--- a/aptos-move/e2e-tests/Cargo.toml
+++ b/aptos-move/e2e-tests/Cargo.toml
@@ -21,13 +21,13 @@ rand = "0.8.3"
 serde = { version = "1.0.124", default-features = false }
 
 ## Move dependencies
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-command-line-common = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-ir-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-read-write-set = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-command-line-common = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-ir-compiler = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+read-write-set = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 
 ## Diem-Move dependencies
 aptos-keygen = { path = "../aptos-keygen" }
diff --git a/aptos-move/e2e-testsuite/Cargo.toml b/aptos-move/e2e-testsuite/Cargo.toml
index 5f2ea5a72e573..3b81f12775fbc 100644
--- a/aptos-move/e2e-testsuite/Cargo.toml
+++ b/aptos-move/e2e-testsuite/Cargo.toml
@@ -13,13 +13,13 @@ publish = false
 proptest = "1.0.0"
 
 ## Move dependencies
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-ir-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-read-write-set = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-ir-compiler = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+read-write-set = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 
 ## Aptos-Move dependencies
 aptos-keygen = { path = "../aptos-keygen" }
diff --git a/aptos-move/framework/Cargo.toml b/aptos-move/framework/Cargo.toml
index 89ee32cdf356a..9b1d9b4a92c42 100644
--- a/aptos-move/framework/Cargo.toml
+++ b/aptos-move/framework/Cargo.toml
@@ -10,25 +10,25 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-abigen = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-docgen = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-command-line-common = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-errmapgen = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-prover = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-abigen = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-docgen = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-command-line-common = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-errmapgen = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-compiler = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-prover = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 aptos-crypto = { path = "../../crates/aptos-crypto" }
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 transaction-builder-generator = { path = "../transaction-builder-generator" }
-move-stdlib = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-symbol-pool = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-package = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-stdlib = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-symbol-pool = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-package = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 
 bcs = "0.1.2"
 anyhow = "1.0.52"
@@ -45,8 +45,8 @@ tempfile = "3.2.0"
 [dev-dependencies]
 datatest-stable = "0.1.1"
 aptos-vm = { path = "../../aptos-move/aptos-vm" }
-move-cli = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-unit-test = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-cli = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-unit-test = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 aptos-transactional-test-harness = { path = "../aptos-transactional-test-harness" }
 
 dir-diff = "0.3.2"
diff --git a/aptos-move/framework/cached-packages/Cargo.toml b/aptos-move/framework/cached-packages/Cargo.toml
index 1580abfaad4e5..c187206653f63 100644
--- a/aptos-move/framework/cached-packages/Cargo.toml
+++ b/aptos-move/framework/cached-packages/Cargo.toml
@@ -13,17 +13,17 @@ publish = false
 aptos-types = { path = "../../../types" }
 aptos-workspace-hack = { path = "../../../crates/aptos-workspace-hack" }
 bcs = "0.1.2"
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", version = "0.0.3", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", version = "0.0.3", features=["address32"] }
 include_dir = { version = "0.7.2", features = ["glob"] }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 once_cell = "1.7.2"
 proptest = { version = "1.0.0", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
 
 
 [build-dependencies]
-move-command-line-common = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-command-line-common = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 framework = { path = ".." }
 
 [features]
diff --git a/aptos-move/genesis-viewer/Cargo.toml b/aptos-move/genesis-viewer/Cargo.toml
index 70a6da6ef9f17..5e93bebcddf21 100644
--- a/aptos-move/genesis-viewer/Cargo.toml
+++ b/aptos-move/genesis-viewer/Cargo.toml
@@ -16,7 +16,7 @@ aptos-resource-viewer = { path = "../aptos-resource-viewer"}
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 cached-framework-packages =  { path = "../framework/cached-packages" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 vm-genesis = { path = "../vm-genesis" }
diff --git a/aptos-move/move-examples/Cargo.toml b/aptos-move/move-examples/Cargo.toml
index d888b3a9ebad4..f90652dc69b3f 100644
--- a/aptos-move/move-examples/Cargo.toml
+++ b/aptos-move/move-examples/Cargo.toml
@@ -12,11 +12,11 @@ edition = "2018"
 aptos-vm = { path = "../aptos-vm" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 structopt = "0.3.21"
-move-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-package = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-stdlib = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-unit-test = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-compiler = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-package = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-stdlib = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-unit-test = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 
 [dev-dependencies]
-move-cli = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-cli = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 tempfile = "3.2.0"
diff --git a/aptos-move/transaction-builder-generator/Cargo.toml b/aptos-move/transaction-builder-generator/Cargo.toml
index 1a72e1175a2e5..0341119ae905a 100644
--- a/aptos-move/transaction-builder-generator/Cargo.toml
+++ b/aptos-move/transaction-builder-generator/Cargo.toml
@@ -20,7 +20,7 @@ textwrap = "0.13.4"
 
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
 serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection" }
 serde-generate = { git = "https://github.com/aptos-labs/serde-reflection" }
 
diff --git a/aptos-move/transaction-replay/Cargo.toml b/aptos-move/transaction-replay/Cargo.toml
index c818dc89b308f..bdc873027245a 100644
--- a/aptos-move/transaction-replay/Cargo.toml
+++ b/aptos-move/transaction-replay/Cargo.toml
@@ -25,13 +25,13 @@ aptos-vm = { path = "../aptos-vm" }
 aptosdb = { path = "../../storage/aptosdb" }
 cached-framework-packages =  { path = "../framework/cached-packages" }
 framework =  { path = "../framework" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65"}
-move-cli = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646"}
+move-cli = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-compiler = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 
 [dev-dependencies]
 vm-genesis = { path = "../vm-genesis" }
diff --git a/aptos-move/vm-genesis/Cargo.toml b/aptos-move/vm-genesis/Cargo.toml
index 787d5efb3f91f..7877382da9532 100644
--- a/aptos-move/vm-genesis/Cargo.toml
+++ b/aptos-move/vm-genesis/Cargo.toml
@@ -24,13 +24,13 @@ aptos-vm = { path = "../aptos-vm" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 cached-framework-packages =  { path = "../framework/cached-packages" }
 framework =  { path = "../framework" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65"}
-move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-read-write-set = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646"}
+move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+read-write-set = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 
 [dev-dependencies]
 proptest = "1.0.0"
diff --git a/aptos-move/writeset-transaction-generator/Cargo.toml b/aptos-move/writeset-transaction-generator/Cargo.toml
index 9156513bd0bbe..5ffb825c9ddf6 100644
--- a/aptos-move/writeset-transaction-generator/Cargo.toml
+++ b/aptos-move/writeset-transaction-generator/Cargo.toml
@@ -28,11 +28,11 @@ aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 aptosdb = { path = "../../storage/aptosdb" }
 cached-framework-packages =  { path = "../framework/cached-packages" }
 framework =  { path = "../framework" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65"}
-move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-read-write-set = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646"}
+move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-compiler = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+read-write-set = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
diff --git a/config/src/config/test_data/validator_full_node.yaml b/config/src/config/test_data/validator_full_node.yaml
index 3d6dca32db5c2..959cf883a3bbc 100644
--- a/config/src/config/test_data/validator_full_node.yaml
+++ b/config/src/config/test_data/validator_full_node.yaml
@@ -31,7 +31,7 @@ full_node_networks:
       network_id:
           private: "vfn"
       seeds:
-        "0x00000000000000000000000000000000c227da54069989f283712e4016704660":
+        "00000000000000000000000000000000c227da54069989f283712e4016704660":
           addresses:
             - "/ip4/127.0.0.1/tcp/58259/ln-noise-ik/c998dcd54c3daf48e0ad516d94b7be0b0b7a27caa00541f2b2c14b13500df10b/ln-handshake/0"
           keys: ["c998dcd54c3daf48e0ad516d94b7be0b0b7a27caa00541f2b2c14b13500df10b"]
diff --git a/config/src/network_id.rs b/config/src/network_id.rs
index 23c69b932164b..2534ab4704935 100644
--- a/config/src/network_id.rs
+++ b/config/src/network_id.rs
@@ -299,10 +299,10 @@ mod test {
         let peer_id = PeerId::random();
         let context = NetworkContext::new(RoleType::Validator, NetworkId::Vfn, peer_id);
         let expected = format!(
-            "---\nrole: {}\nnetwork_id: {}\npeer_id: \"{}\"\n",
+            "---\nrole: {}\nnetwork_id: {}\npeer_id: {:x}\n",
             RoleType::Validator,
             VFN_NETWORK,
-            peer_id.to_hex_literal()
+            peer_id
         );
         assert_eq!(expected, serde_yaml::to_string(&context).unwrap());
     }
diff --git a/crates/aptos-faucet/src/main.rs b/crates/aptos-faucet/src/main.rs
index 14376189fe8a5..5afc808b9a480 100644
--- a/crates/aptos-faucet/src/main.rs
+++ b/crates/aptos-faucet/src/main.rs
@@ -34,7 +34,7 @@ struct Args {
     #[structopt(short = "m", long, default_value = "/opt/aptos/etc/mint.key")]
     pub mint_key_file_path: String,
     /// Address of the account to send transactions from.
-    /// On Testnet, for example, this is 0xa550c18.
+    /// On Testnet, for example, this is a550c18.
     /// If not present, the mint key's address is used
     #[structopt(short = "t", long, parse(try_from_str = AccountAddress::from_hex_literal))]
     pub mint_account_address: Option<AccountAddress>,
@@ -329,7 +329,7 @@ mod tests {
     async fn test_mint_auth_key() {
         let (accounts, service) = setup(None);
         let filter = routes(service);
-        let auth_key = "0x459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d";
+        let auth_key = "459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d";
         let amount = 13345;
         let resp = warp::test::request()
             .method("POST")
@@ -340,7 +340,7 @@ mod tests {
         assert_eq!(values.len(), 2);
         let reader = accounts.read();
         let addr = AccountAddress::try_from(
-            "0x459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d".to_owned(),
+            "459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d".to_owned(),
         )
         .unwrap();
         let account = reader.get(&addr).expect("account should be created");
@@ -352,7 +352,7 @@ mod tests {
         let (accounts, service) = setup(None);
         let filter = routes(service);
 
-        let pub_key = "0x459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d";
+        let pub_key = "459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d";
         let amount = 13345;
         let resp = warp::test::request()
             .method("POST")
@@ -363,7 +363,7 @@ mod tests {
         assert_eq!(values.len(), 2);
         let reader = accounts.read();
         let addr = AccountAddress::try_from(
-            "0x9FF98E82355EB13098F3B1157AC018A725C62C0E0820F422000814CDBA407835".to_owned(),
+            "9FF98E82355EB13098F3B1157AC018A725C62C0E0820F422000814CDBA407835".to_owned(),
         )
         .unwrap();
         let account = reader.get(&addr).expect("account should be created");
@@ -375,7 +375,7 @@ mod tests {
         let (accounts, service) = setup(None);
         let filter = routes(service);
 
-        let address = "0x459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d";
+        let address = "459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d";
         let amount = 13345;
         let resp = warp::test::request()
             .method("POST")
@@ -387,7 +387,7 @@ mod tests {
         assert_eq!(values.len(), 2);
         let reader = accounts.read();
         let addr = AccountAddress::try_from(
-            "0x459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d".to_owned(),
+            "459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d".to_owned(),
         )
         .unwrap();
         let account = reader.get(&addr).expect("account should be created");
@@ -399,7 +399,7 @@ mod tests {
         let (accounts, service) = setup(None);
         let filter = routes(service);
 
-        let address = "0x459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d";
+        let address = "459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d";
         let amount = 13345;
         let resp = warp::test::request()
             .method("POST")
@@ -411,7 +411,7 @@ mod tests {
         assert_eq!(values.len(), 2);
         let reader = accounts.read();
         let addr = AccountAddress::try_from(
-            "0x459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d".to_owned(),
+            "459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d".to_owned(),
         )
         .unwrap();
         let account = reader.get(&addr).expect("account should be created");
@@ -423,7 +423,7 @@ mod tests {
         let (accounts, service) = setup(None);
         let filter = routes(service);
 
-        let auth_key = "0x459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d";
+        let auth_key = "459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d";
         let amount = 13345;
         let resp = warp::test::request()
             .method("POST")
@@ -443,7 +443,7 @@ mod tests {
 
         let reader = accounts.read();
         let addr = AccountAddress::try_from(
-            "0x459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d".to_owned(),
+            "459c77a38803bd53f3adee52703810e3a74fd7c46952c497e75afb0a7932586d".to_owned(),
         )
         .unwrap();
         let account = reader.get(&addr).expect("account should be created");
diff --git a/crates/aptos-rest-client/Cargo.toml b/crates/aptos-rest-client/Cargo.toml
index 411b4f6d7cd36..a1e15f88984b0 100644
--- a/crates/aptos-rest-client/Cargo.toml
+++ b/crates/aptos-rest-client/Cargo.toml
@@ -28,4 +28,4 @@ aptos-crypto = { path = "../aptos-crypto" }
 aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
diff --git a/crates/aptos-workspace-hack/Cargo.toml b/crates/aptos-workspace-hack/Cargo.toml
index 04d4a58876084..330d526a04005 100644
--- a/crates/aptos-workspace-hack/Cargo.toml
+++ b/crates/aptos-workspace-hack/Cargo.toml
@@ -13,7 +13,10 @@ edition = "2018"
 [dependencies]
 Inflector = { version = "0.11.4", features = ["heavyweight", "lazy_static", "regex"] }
 anyhow = { version = "1.0.56", features = ["backtrace", "std"] }
+arrayvec = { version = "0.5.2", features = ["array-sizes-33-128", "std"] }
 backtrace = { version = "0.3.58", features = ["addr2line", "gimli-symbolize", "miniz_oxide", "object", "serde", "std"] }
+block-buffer = { version = "0.9.0", default-features = false, features = ["block-padding"] }
+bstr = { version = "0.2.17", features = ["lazy_static", "regex-automata", "serde", "serde1", "serde1-nostd", "std", "unicode"] }
 byteorder = { version = "1.4.3", features = ["i128", "std"] }
 bytes = { version = "1.1.0", features = ["serde", "std"] }
 chrono = { version = "0.4.19", features = ["clock", "libc", "oldtime", "serde", "std", "time", "winapi"] }
@@ -33,6 +36,7 @@ generic-array = { version = "0.14.5", default-features = false, features = ["mor
 getrandom = { version = "0.2.6", default-features = false, features = ["std"] }
 hyper = { version = "0.14.18", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
 include_dir = { version = "0.7.2", features = ["glob"] }
+indexmap = { version = "1.8.1", default-features = false, features = ["std"] }
 itertools = { version = "0.10.3", features = ["use_alloc", "use_std"] }
 libc = { version = "0.2.123", features = ["std"] }
 log = { version = "0.4.16", default-features = false, features = ["serde", "std"] }
@@ -41,10 +45,9 @@ num-integer = { version = "0.1.44", features = ["i128", "std"] }
 num-traits = { version = "0.2.14", features = ["i128", "std"] }
 parking_lot = { version = "0.12.0", features = ["send_guard"] }
 phf_shared = { version = "0.10.0", features = ["std", "uncased"] }
-plotters = { version = "0.3.1", default-features = false, features = ["area_series", "evcxr", "histogram", "line_series", "plotters-svg", "svg_backend"] }
 rand = { version = "0.8.4", features = ["alloc", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] }
 regex = { version = "1.5.5", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
-regex-automata = { version = "0.1.10", features = ["regex-syntax", "std"] }
+regex-syntax = { version = "0.6.25", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
 reqwest = { version = "0.11.10", features = ["__tls", "blocking", "cookie_crate", "cookie_store", "cookies", "default-tls", "hyper-tls", "json", "native-tls-crate", "proc-macro-hack", "serde_json", "stream", "tokio-native-tls", "tokio-util"] }
 rusty-fork = { version = "0.3.0", features = ["timeout", "wait-timeout"] }
 serde = { version = "1.0.136", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
@@ -55,13 +58,17 @@ subtle = { version = "2.4.1", default-features = false, features = ["std"] }
 tokio = { version = "1.17.0", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "test-util", "time", "tokio-macros"] }
 tokio-util = { version = "0.6.9", features = ["codec", "compat", "futures-io", "io"] }
 tracing = { version = "0.1.34", features = ["attributes", "log", "std", "tracing-attributes"] }
+tracing-core = { version = "0.1.26", features = ["lazy_static", "std"] }
 warp = { version = "0.3.2", features = ["multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] }
 zeroize = { version = "1.5.4", features = ["alloc", "zeroize_derive"] }
 
 [build-dependencies]
 Inflector = { version = "0.11.4", features = ["heavyweight", "lazy_static", "regex"] }
 anyhow = { version = "1.0.56", features = ["backtrace", "std"] }
+arrayvec = { version = "0.5.2", features = ["array-sizes-33-128", "std"] }
 backtrace = { version = "0.3.58", features = ["addr2line", "gimli-symbolize", "miniz_oxide", "object", "serde", "std"] }
+block-buffer = { version = "0.9.0", default-features = false, features = ["block-padding"] }
+bstr = { version = "0.2.17", features = ["lazy_static", "regex-automata", "serde", "serde1", "serde1-nostd", "std", "unicode"] }
 byteorder = { version = "1.4.3", features = ["i128", "std"] }
 bytes = { version = "1.1.0", features = ["serde", "std"] }
 cc = { version = "1.0.73", default-features = false, features = ["jobserver", "parallel"] }
@@ -82,6 +89,7 @@ generic-array = { version = "0.14.5", default-features = false, features = ["mor
 getrandom = { version = "0.2.6", default-features = false, features = ["std"] }
 hyper = { version = "0.14.18", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
 include_dir = { version = "0.7.2", features = ["glob"] }
+indexmap = { version = "1.8.1", default-features = false, features = ["std"] }
 itertools = { version = "0.10.3", features = ["use_alloc", "use_std"] }
 libc = { version = "0.2.123", features = ["std"] }
 log = { version = "0.4.16", default-features = false, features = ["serde", "std"] }
@@ -90,10 +98,9 @@ num-integer = { version = "0.1.44", features = ["i128", "std"] }
 num-traits = { version = "0.2.14", features = ["i128", "std"] }
 parking_lot = { version = "0.12.0", features = ["send_guard"] }
 phf_shared = { version = "0.10.0", features = ["std", "uncased"] }
-plotters = { version = "0.3.1", default-features = false, features = ["area_series", "evcxr", "histogram", "line_series", "plotters-svg", "svg_backend"] }
 rand = { version = "0.8.4", features = ["alloc", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] }
 regex = { version = "1.5.5", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
-regex-automata = { version = "0.1.10", features = ["regex-syntax", "std"] }
+regex-syntax = { version = "0.6.25", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
 reqwest = { version = "0.11.10", features = ["__tls", "blocking", "cookie_crate", "cookie_store", "cookies", "default-tls", "hyper-tls", "json", "native-tls-crate", "proc-macro-hack", "serde_json", "stream", "tokio-native-tls", "tokio-util"] }
 rusty-fork = { version = "0.3.0", features = ["timeout", "wait-timeout"] }
 serde = { version = "1.0.136", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
@@ -105,6 +112,7 @@ syn = { version = "1.0.91", features = ["clone-impls", "derive", "extra-traits",
 tokio = { version = "1.17.0", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "test-util", "time", "tokio-macros"] }
 tokio-util = { version = "0.6.9", features = ["codec", "compat", "futures-io", "io"] }
 tracing = { version = "0.1.34", features = ["attributes", "log", "std", "tracing-attributes"] }
+tracing-core = { version = "0.1.26", features = ["lazy_static", "std"] }
 warp = { version = "0.3.2", features = ["multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] }
 zeroize = { version = "1.5.4", features = ["alloc", "zeroize_derive"] }
 
diff --git a/crates/aptos/Cargo.toml b/crates/aptos/Cargo.toml
index d1ae4566339b0..04c72bb960c41 100644
--- a/crates/aptos/Cargo.toml
+++ b/crates/aptos/Cargo.toml
@@ -39,9 +39,9 @@ aptos-vm = { path = "../../aptos-move/aptos-vm" }
 bcs = "0.1.2"
 short-hex-str = { path = "../short-hex-str" }
 cached-framework-packages =  { path = "../../aptos-move/framework/cached-packages" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-cli = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
-move-package = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-unit-test = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-cli = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
+move-package = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-unit-test = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml
index 57367118ad8ba..b80137d3fcd74 100644
--- a/execution/executor/Cargo.toml
+++ b/execution/executor/Cargo.toml
@@ -26,7 +26,7 @@ aptos-infallible = { path = "../../crates/aptos-infallible" }
 aptos-secure-net = { path = "../../secure/net" }
 aptos-state-view = { path = "../../storage/state-view" }
 aptos-types = { path = "../../types" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
 aptos-vm = { path = "../../aptos-move/aptos-vm" }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
 scratchpad = { path = "../../storage/scratchpad" }
@@ -41,7 +41,7 @@ aptos-config = { path = "../../config" }
 aptos-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] }
 aptos-temppath = { path = "../../crates/aptos-temppath" }
 aptosdb = { path = "../../storage/aptosdb" }
-move-ir-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-ir-compiler = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 storage-interface = { path = "../../storage/storage-interface", features=["fuzzing"] }
 aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
 vm-genesis = { path = "../../aptos-move/vm-genesis" }
diff --git a/network/discovery/Cargo.toml b/network/discovery/Cargo.toml
index 19200ddd994c1..20ca9e173fd1d 100644
--- a/network/discovery/Cargo.toml
+++ b/network/discovery/Cargo.toml
@@ -27,7 +27,7 @@ aptos-time-service = {path = "../../crates/aptos-time-service"}
 aptos-secure-storage = { path = "../../secure/storage" }
 aptos-types = {path = "../../types"}
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
 network = {path = "../../network"}
 short-hex-str = { path = "../../crates/short-hex-str" }
 
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
index 33a57a8c100a4..b6105ee78337d 100644
--- a/sdk/Cargo.toml
+++ b/sdk/Cargo.toml
@@ -16,6 +16,6 @@ serde = { version = "1.0.124", features = ["derive"] }
 
 aptos-crypto = { path = "../crates/aptos-crypto" }
 aptos-types = { path = "../types" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", version = "0.0.3", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", version = "0.0.3", features=["address32"] }
 aptos-transaction-builder = { path = "./transaction-builder" }
 aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" }
diff --git a/sdk/transaction-builder/Cargo.toml b/sdk/transaction-builder/Cargo.toml
index 30c8f00baf973..dfae45f745fd0 100644
--- a/sdk/transaction-builder/Cargo.toml
+++ b/sdk/transaction-builder/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 bcs = "0.1.2"
 once_cell = "1.7.2"
 
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", version = "0.0.3", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", version = "0.0.3", features=["address32"] }
 aptos-types = { path = "../../types" }
 proptest-derive = { version = "0.3.0", optional = true }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
@@ -22,7 +22,7 @@ cached-framework-packages = {path = "../../aptos-move/framework/cached-packages"
 [dev-dependencies]
 proptest = "1.0.0"
 proptest-derive = "0.3.0"
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features = ["fuzzing", "address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features = ["fuzzing", "address32"] }
 
 [features]
 default = []
diff --git a/state-sync/inter-component/consensus-notifications/Cargo.toml b/state-sync/inter-component/consensus-notifications/Cargo.toml
index c07d7d1227588..00a4e5d813415 100644
--- a/state-sync/inter-component/consensus-notifications/Cargo.toml
+++ b/state-sync/inter-component/consensus-notifications/Cargo.toml
@@ -23,4 +23,4 @@ aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspac
 [dev-dependencies]
 claim = "0.5.0"
 
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
diff --git a/state-sync/inter-component/event-notifications/Cargo.toml b/state-sync/inter-component/event-notifications/Cargo.toml
index 4876b04f2e82b..550cd8cac4879 100644
--- a/state-sync/inter-component/event-notifications/Cargo.toml
+++ b/state-sync/inter-component/event-notifications/Cargo.toml
@@ -32,5 +32,5 @@ aptos-temppath = { path = "../../../crates/aptos-temppath" }
 aptos-vm = { path = "../../../aptos-move/aptos-vm" }
 aptosdb = { path = "../../../storage/aptosdb" }
 executor-test-helpers = { path = "../../../execution/executor-test-helpers" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
 vm-genesis = { path = "../../../aptos-move/vm-genesis", features = ["fuzzing"] }
diff --git a/state-sync/state-sync-v1/Cargo.toml b/state-sync/state-sync-v1/Cargo.toml
index 26856a3bf05ea..f32ecfd5b0353 100644
--- a/state-sync/state-sync-v1/Cargo.toml
+++ b/state-sync/state-sync-v1/Cargo.toml
@@ -62,7 +62,7 @@ aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers" }
 aptosdb = { path = "../../storage/aptosdb" }
 executor-test-helpers = { path = "../../execution/executor-test-helpers" }
 memsocket = { path = "../../network/memsocket" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
 network = { path = "../../network", features = ["fuzzing", "testing"] }
 network-builder = { path  = "../../network/builder" }
 storage-service = { path = "../../storage/storage-service" }
diff --git a/state-sync/storage-service/server/Cargo.toml b/state-sync/storage-service/server/Cargo.toml
index e010cb11deb47..faacd2b21faa3 100644
--- a/state-sync/storage-service/server/Cargo.toml
+++ b/state-sync/storage-service/server/Cargo.toml
@@ -38,5 +38,5 @@ claim = "0.5.0"
 aptos-crypto = { path = "../../../crates/aptos-crypto" }
 aptos-time-service = { path = "../../../crates/aptos-time-service", features = ["async", "testing"] }
 aptos-types = { path = "../../../types" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
 storage-interface = { path = "../../../storage/storage-interface" }
diff --git a/storage/aptosdb/Cargo.toml b/storage/aptosdb/Cargo.toml
index bbc35f409643a..cdda3ff70df32 100644
--- a/storage/aptosdb/Cargo.toml
+++ b/storage/aptosdb/Cargo.toml
@@ -35,7 +35,7 @@ aptos-temppath = { path = "../../crates/aptos-temppath", optional = true }
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
 executor-types = { path = "../../execution/executor-types", optional = true }
-move-core-types = {git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"]}
+move-core-types = {git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"]}
 num-variants = { path = "../../crates/num-variants" }
 schemadb = { path = "../schemadb" }
 scratchpad = { path = "../scratchpad", optional = true }
diff --git a/storage/storage-interface/Cargo.toml b/storage/storage-interface/Cargo.toml
index d3e3f795c2a04..867195c91f032 100644
--- a/storage/storage-interface/Cargo.toml
+++ b/storage/storage-interface/Cargo.toml
@@ -22,7 +22,7 @@ aptos-state-view = { path = "../state-view" }
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
 scratchpad = { path = "../scratchpad" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
 
 [features]
 default = []
diff --git a/terraform/helm/validator/files/configs/fullnode.yaml b/terraform/helm/validator/files/configs/fullnode.yaml
index 6cabcceb80ea5..3f7aada4977c2 100644
--- a/terraform/helm/validator/files/configs/fullnode.yaml
+++ b/terraform/helm/validator/files/configs/fullnode.yaml
@@ -31,7 +31,7 @@ full_node_networks:
     private: "vfn"
   listen_address: "/ip4/0.0.0.0/tcp/6181"
   seeds:
-    0x00000000000000000000000000000000d58bc7bb154b38039bc9096ce04e1237:
+    00000000000000000000000000000000d58bc7bb154b38039bc9096ce04e1237:
       addresses:
       - "/dns4/{{ include "aptos-validator.fullname" . }}-validator/tcp/6181/ln-noise-ik/f0274c2774519281a8332d0bb9d8101bd58bc7bb154b38039bc9096ce04e1237/ln-handshake/0"
       role: "Validator"
diff --git a/terraform/helm/validator/files/configs/validator.yaml b/terraform/helm/validator/files/configs/validator.yaml
index fc341f16e19c0..7aea78b5402d8 100644
--- a/terraform/helm/validator/files/configs/validator.yaml
+++ b/terraform/helm/validator/files/configs/validator.yaml
@@ -80,7 +80,7 @@ full_node_networks:
   identity:
     type: "from_config"
     key: "b0f405a3e75516763c43a2ae1d70423699f34cd68fa9f8c6bb2d67aa87d0af69"
-    peer_id: "0x00000000000000000000000000000000d58bc7bb154b38039bc9096ce04e1237"
+    peer_id: "00000000000000000000000000000000d58bc7bb154b38039bc9096ce04e1237"
 
 {{- if .Values.exposeValidatorRestApi }}
 api:
diff --git a/testsuite/aptos-fuzzer/Cargo.toml b/testsuite/aptos-fuzzer/Cargo.toml
index 76af13e424346..66b6334d28b0e 100644
--- a/testsuite/aptos-fuzzer/Cargo.toml
+++ b/testsuite/aptos-fuzzer/Cargo.toml
@@ -39,14 +39,14 @@ aptos-mempool = { path = "../../mempool" }
 aptos-types = { path = "../../types", features = ["fuzzing"] }
 aptos-vault-client = { path = "../../secure/storage/vault", features = ["fuzzing"] }
 aptosdb = { path = "../../storage/aptosdb", features = ["fuzzing"] }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features = ["fuzzing"] }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features = ["fuzzing", "address32"] }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features = ["fuzzing"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features = ["fuzzing", "address32"] }
 network = { path = "../../network", features = ["fuzzing"] }
 safety-rules = { path = "../../consensus/safety-rules", features = ["fuzzing", "testing"]  }
 scratchpad = { path = "../../storage/scratchpad", features = ["fuzzing"]}
 state-sync-v1 = { path = "../../state-sync/state-sync-v1", features = ["fuzzing", "aptosdb"]  }
 storage-interface = { path = "../../storage/storage-interface" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features = ["fuzzing"] }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features = ["fuzzing"] }
 
 [dev-dependencies]
 rusty-fork = "0.3.0"
diff --git a/testsuite/generate-format/Cargo.toml b/testsuite/generate-format/Cargo.toml
index 2a02af7002950..bc5941568822e 100644
--- a/testsuite/generate-format/Cargo.toml
+++ b/testsuite/generate-format/Cargo.toml
@@ -25,7 +25,7 @@ aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive"}
 aptos-types = { path = "../../types", features=["fuzzing"] }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
 network = { path = "../../network" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["fuzzing", "address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["fuzzing", "address32"] }
 
 [[bin]]
 name = "compute"
diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml
index 039f180067079..5832e4b00a1d6 100644
--- a/testsuite/smoke-test/Cargo.toml
+++ b/testsuite/smoke-test/Cargo.toml
@@ -31,10 +31,10 @@ aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-h
 cached-framework-packages =  { path = "../../aptos-move/framework/cached-packages" }
 forge = { path = "../forge" }
 hex = "0.4.3"
-move-command-line-common = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-ir-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-stdlib = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
-move-package = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-command-line-common = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-ir-compiler = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-stdlib = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
+move-package = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 
 
 [dev-dependencies]
diff --git a/types/Cargo.toml b/types/Cargo.toml
index 20fe2ad26d83e..24b853e9e18a0 100644
--- a/types/Cargo.toml
+++ b/types/Cargo.toml
@@ -31,8 +31,8 @@ tiny-keccak = { version = "2.0.2", default-features = false, features = ["sha3"]
 bcs = "0.1.2"
 aptos-crypto = { path = "../crates/aptos-crypto" }
 aptos-crypto-derive = { path = "../crates/aptos-crypto-derive" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", version = "0.0.3", features=["address32"] }
-move-read-write-set-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", version = "0.0.3", features=["address32"] }
+move-read-write-set-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
 aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" }
 
 [dev-dependencies]
@@ -42,7 +42,7 @@ proptest-derive = "0.3.0"
 serde_json = "1.0.64"
 
 aptos-crypto = { path = "../crates/aptos-crypto", features = ["fuzzing"] }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features = ["fuzzing","address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features = ["fuzzing","address32"] }
 
 [features]
 default = []
diff --git a/vm-validator/Cargo.toml b/vm-validator/Cargo.toml
index 773d3369b758f..604292727da08 100644
--- a/vm-validator/Cargo.toml
+++ b/vm-validator/Cargo.toml
@@ -30,7 +30,7 @@ aptos-types = { path = "../types", features = ["fuzzing"] }
 aptos-vm = { path = "../aptos-move/aptos-vm" }
 aptosdb = { path = "../storage/aptosdb", features = ["fuzzing"] }
 vm-genesis = { path = "../aptos-move/vm-genesis" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
 
 [features]
 default = []
diff --git a/x.toml b/x.toml
index 6f0b1b2a65c53..b1bc2a0ec82f5 100644
--- a/x.toml
+++ b/x.toml
@@ -78,11 +78,11 @@ third-party = [
     # Exclude the fail crate because the failpoints feature should only be enabled
     # for certain builds.
     { name = "fail" },
-    { name = "move-binary-format", git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" },
-    { name = "move-core-types", git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] },
-    { name = "move-stdlib", git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" },
-    { name = "move-vm-runtime", git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" },
-    { name = "move-vm-types", git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" },
+    { name = "move-binary-format", git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" },
+    { name = "move-core-types", git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] },
+    { name = "move-stdlib", git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" },
+    { name = "move-vm-runtime", git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" },
+    { name = "move-vm-types", git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" },
 ]
 
 # This follows the same syntax as CargoOptionsSummary in guppy.