diff --git a/Cargo.lock b/Cargo.lock
index 4e54c32dc8abd..e8203cb0cad3a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -239,7 +239,7 @@ dependencies = [
  "aptos-crypto-derive",
  "aptos-workspace-hack",
  "bcs",
- "bitvec",
+ "bitvec 0.19.6",
  "byteorder",
  "bytes",
  "criterion",
@@ -260,7 +260,7 @@ dependencies = [
  "serde_bytes",
  "serde_json",
  "sha2",
- "sha3",
+ "sha3 0.9.1",
  "static_assertions",
  "thiserror",
  "tiny-keccak",
@@ -522,7 +522,7 @@ dependencies = [
  "aptos-workspace-hack",
  "hex",
  "rand 0.8.4",
- "sha3",
+ "sha3 0.9.1",
 ]
 
 [[package]]
@@ -1275,6 +1275,12 @@ 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"
@@ -1334,6 +1340,18 @@ 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.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.0.1"
@@ -1348,7 +1366,7 @@ checksum = "88fb5a785d6b44fd9d6700935608639af1b8356de1e55d5f7c2740f4faa15d82"
 dependencies = [
  "addr2line",
  "cc",
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
  "object",
@@ -1520,7 +1538,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33"
 dependencies = [
  "funty",
- "radium",
+ "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",
  "tap",
  "wyz",
 ]
@@ -1608,6 +1638,12 @@ 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"
@@ -1617,13 +1653,13 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 [[package]]
 name = "bytecode-interpreter-crypto"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "curve25519-dalek-fiat",
  "ed25519-dalek-fiat",
  "sha2",
- "sha3",
+ "sha3 0.9.1",
  "workspace-hack",
 ]
 
@@ -1722,6 +1758,12 @@ dependencies = [
  "target-lexicon",
 ]
 
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -1827,6 +1869,15 @@ dependencies = [
  "vec_map",
 ]
 
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "codespan"
 version = "0.11.1"
@@ -2082,7 +2133,7 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -2137,7 +2188,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-epoch",
@@ -2151,7 +2202,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "crossbeam-utils",
 ]
 
@@ -2161,7 +2212,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
@@ -2172,7 +2223,7 @@ version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "crossbeam-utils",
  "lazy_static 1.4.0",
  "memoffset",
@@ -2185,7 +2236,7 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dd435b205a4842da59efd07628f921c096bc1cc0a156835b4fa0bcb9a19bcce"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "crossbeam-utils",
 ]
 
@@ -2195,7 +2246,7 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "lazy_static 1.4.0",
 ]
 
@@ -2286,7 +2337,7 @@ version = "4.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "num_cpus",
 ]
 
@@ -2296,7 +2347,7 @@ version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0834a35a3fce649144119e18da2a4d8ed12ef3862f47183fd46f625d072d96c"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "num_cpus",
  "parking_lot 0.12.0",
 ]
@@ -2383,6 +2434,17 @@ 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.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
+]
+
 [[package]]
 name = "determinator"
 version = "0.7.0"
@@ -2418,6 +2480,7 @@ dependencies = [
  "diem-framework-releases",
  "move-cli",
  "move-core-types",
+ "move-vm-types",
  "structopt",
 ]
 
@@ -2530,7 +2593,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "dirs-sys-next",
 ]
 
@@ -2629,7 +2692,7 @@ version = "0.8.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -2670,6 +2733,12 @@ 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.18"
@@ -2679,6 +2748,60 @@ 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b40347dcad92b4dfeb9765c41c48503416daddf6dba55b74614dc035a43ed2"
+
 [[package]]
 name = "event-notifications"
 version = "0.1.0"
@@ -2706,6 +2829,64 @@ 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-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 = "execution-correctness"
 version = "0.1.0"
@@ -2890,6 +3071,18 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2176874104231d65f2dd4d0c2e027e78614170d356c8ccfa826aaef103c8fe89"
 
+[[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"
@@ -3271,7 +3464,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
 ]
@@ -3282,7 +3475,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "wasi 0.10.0+wasi-snapshot-preview1",
 ]
@@ -3351,7 +3544,7 @@ checksum = "2d2086fdcefd1a3dc6f4ba4568147648231e2211be1fcc4d1063601c6baadd2e"
 dependencies = [
  "camino",
  "cargo_metadata",
- "cfg-if",
+ "cfg-if 1.0.0",
  "debug-ignore",
  "fixedbitset 0.4.1",
  "guppy-summaries",
@@ -3378,7 +3571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ca5ad97ff788027e546992f7f374e277da50ca4e06dab268f33088a74897e9e"
 dependencies = [
  "camino",
- "cfg-if",
+ "cfg-if 1.0.0",
  "diffus",
  "semver 1.0.6",
  "serde 1.0.136",
@@ -3393,9 +3586,9 @@ checksum = "92620684d99f750bae383ecb3be3748142d6095760afd5cbcf2261e9a279d780"
 
 [[package]]
 name = "h2"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e"
+checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b"
 dependencies = [
  "bytes",
  "fnv",
@@ -3419,7 +3612,7 @@ dependencies = [
  "atomicwrites",
  "bimap",
  "camino",
- "cfg-if",
+ "cfg-if 1.0.0",
  "debug-ignore",
  "diffy",
  "guppy",
@@ -3458,6 +3651,21 @@ 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"
@@ -3610,9 +3818,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "humantime-serde"
-version = "1.0.1"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac34a56cfd4acddb469cc7fff187ed5ac36f498ba085caf8bbc725e3ff474058"
+checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c"
 dependencies = [
  "humantime 2.1.0",
  "serde 1.0.136",
@@ -3728,6 +3936,35 @@ 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.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
+]
+
 [[package]]
 name = "include_dir"
 version = "0.6.2"
@@ -3801,7 +4038,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -4053,9 +4290,9 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
 dependencies = [
- "arrayvec",
+ "arrayvec 0.5.2",
  "bitflags",
- "cfg-if",
+ "cfg-if 1.0.0",
  "ryu",
  "static_assertions",
 ]
@@ -4082,7 +4319,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "winapi 0.3.9",
 ]
 
@@ -4104,6 +4341,15 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
+[[package]]
+name = "lock_api"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
+dependencies = [
+ "scopeguard",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.6"
@@ -4119,7 +4365,7 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "serde 1.0.136",
 ]
 
@@ -4222,14 +4468,15 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2"
+checksum = "7ba42135c6a5917b9db9cd7b293e5409e1c6b041e6f9825e92e55a894c63b6f8"
 dependencies = [
  "libc",
  "log",
  "miow",
  "ntapi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "winapi 0.3.9",
 ]
 
@@ -4251,7 +4498,7 @@ checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
 [[package]]
 name = "move-abigen"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4268,7 +4515,7 @@ dependencies = [
 [[package]]
 name = "move-binary-format"
 version = "0.0.3"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "mirai-annotations",
@@ -4285,7 +4532,7 @@ dependencies = [
 [[package]]
 name = "move-borrow-graph"
 version = "0.0.1"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "mirai-annotations",
  "workspace-hack",
@@ -4294,7 +4541,7 @@ dependencies = [
 [[package]]
 name = "move-bytecode-source-map"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4311,19 +4558,20 @@ dependencies = [
 [[package]]
 name = "move-bytecode-utils"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "move-binary-format",
  "move-core-types",
  "petgraph 0.5.1",
+ "serde-reflection",
  "workspace-hack",
 ]
 
 [[package]]
 name = "move-bytecode-verifier"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "mirai-annotations",
@@ -4337,7 +4585,7 @@ dependencies = [
 [[package]]
 name = "move-bytecode-viewer"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "move-binary-format",
@@ -4355,7 +4603,7 @@ dependencies = [
 [[package]]
 name = "move-cli"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4398,7 +4646,7 @@ dependencies = [
 [[package]]
 name = "move-command-line-common"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "difference",
@@ -4412,7 +4660,7 @@ dependencies = [
 [[package]]
 name = "move-compiler"
 version = "0.0.1"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4428,6 +4676,7 @@ dependencies = [
  "move-ir-to-bytecode",
  "move-ir-types",
  "move-symbol-pool",
+ "num-bigint",
  "once_cell",
  "petgraph 0.5.1",
  "regex",
@@ -4440,7 +4689,7 @@ dependencies = [
 [[package]]
 name = "move-core-types"
 version = "0.0.3"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4459,7 +4708,7 @@ dependencies = [
 [[package]]
 name = "move-coverage"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4481,7 +4730,7 @@ dependencies = [
 [[package]]
 name = "move-disassembler"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "colored",
@@ -4500,7 +4749,7 @@ dependencies = [
 [[package]]
 name = "move-docgen"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "codespan",
@@ -4520,7 +4769,7 @@ dependencies = [
 [[package]]
 name = "move-errmapgen"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4549,7 +4798,7 @@ dependencies = [
 [[package]]
 name = "move-ir-compiler"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4569,7 +4818,7 @@ dependencies = [
 [[package]]
 name = "move-ir-to-bytecode"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "codespan-reporting",
@@ -4589,7 +4838,7 @@ dependencies = [
 [[package]]
 name = "move-ir-to-bytecode-syntax"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "hex",
@@ -4603,7 +4852,7 @@ dependencies = [
 [[package]]
 name = "move-ir-types"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "hex",
@@ -4618,7 +4867,7 @@ dependencies = [
 [[package]]
 name = "move-model"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "codespan",
@@ -4645,7 +4894,7 @@ dependencies = [
 [[package]]
 name = "move-package"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4661,6 +4910,8 @@ dependencies = [
  "move-errmapgen",
  "move-model",
  "move-symbol-pool",
+ "named-lock",
+ "once_cell",
  "petgraph 0.5.1",
  "ptree",
  "regex",
@@ -4677,7 +4928,7 @@ dependencies = [
 [[package]]
 name = "move-prover"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4716,7 +4967,7 @@ dependencies = [
 [[package]]
 name = "move-prover-boogie-backend"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4745,7 +4996,7 @@ dependencies = [
 [[package]]
 name = "move-read-write-set-types"
 version = "0.0.3"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "move-binary-format",
@@ -4757,7 +5008,7 @@ dependencies = [
 [[package]]
 name = "move-resource-viewer"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -4773,10 +5024,11 @@ dependencies = [
 [[package]]
 name = "move-stackless-bytecode"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "codespan",
  "codespan-reporting",
+ "ethnum",
  "im",
  "itertools",
  "log",
@@ -4800,7 +5052,7 @@ dependencies = [
 [[package]]
 name = "move-stackless-bytecode-interpreter"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "bytecode-interpreter-crypto",
@@ -4820,7 +5072,7 @@ dependencies = [
 [[package]]
 name = "move-stdlib"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "log",
  "move-binary-format",
@@ -4833,7 +5085,7 @@ dependencies = [
  "move-vm-runtime",
  "move-vm-types",
  "sha2",
- "sha3",
+ "sha3 0.9.1",
  "smallvec",
  "walkdir",
  "workspace-hack",
@@ -4842,7 +5094,7 @@ dependencies = [
 [[package]]
 name = "move-symbol-pool"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "once_cell",
  "serde 1.0.136",
@@ -4852,7 +5104,7 @@ dependencies = [
 [[package]]
 name = "move-transactional-test-runner"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "colored",
@@ -4884,7 +5136,7 @@ dependencies = [
 [[package]]
 name = "move-unit-test"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "colored",
@@ -4909,7 +5161,7 @@ dependencies = [
 [[package]]
 name = "move-vm-runtime"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "fail",
  "mirai-annotations",
@@ -4919,7 +5171,7 @@ dependencies = [
  "move-vm-types",
  "once_cell",
  "parking_lot 0.11.2",
- "sha3",
+ "sha3 0.9.1",
  "tracing",
  "workspace-hack",
 ]
@@ -4927,7 +5179,7 @@ dependencies = [
 [[package]]
 name = "move-vm-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "move-binary-format",
@@ -4939,7 +5191,7 @@ dependencies = [
 [[package]]
 name = "move-vm-types"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "bcs",
  "mirai-annotations",
@@ -4986,6 +5238,20 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "named-lock"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3ab176d4bcfbcb53b8c7c5a25cb2c01674cda33db27064a85a16814c88c1f2d"
+dependencies = [
+ "libc",
+ "once_cell",
+ "parking_lot 0.10.2",
+ "thiserror",
+ "widestring",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.8"
@@ -5188,7 +5454,7 @@ checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
 dependencies = [
  "bitflags",
  "cc",
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "memoffset",
 ]
@@ -5389,7 +5655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
 dependencies = [
  "bitflags",
- "cfg-if",
+ "cfg-if 1.0.0",
  "foreign-types",
  "libc",
  "once_cell",
@@ -5463,6 +5729,42 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4"
 
+[[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.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
+dependencies = [
+ "lock_api 0.3.4",
+ "parking_lot_core 0.7.2",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -5470,7 +5772,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
- "lock_api",
+ "lock_api 0.4.6",
  "parking_lot_core 0.8.5",
 ]
 
@@ -5480,20 +5782,34 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
 dependencies = [
- "lock_api",
+ "lock_api 0.4.6",
  "parking_lot_core 0.9.1",
 ]
 
+[[package]]
+name = "parking_lot_core"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
+dependencies = [
+ "cfg-if 0.1.10",
+ "cloudabi",
+ "libc",
+ "redox_syscall 0.1.57",
+ "smallvec",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "parking_lot_core"
 version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.11",
  "smallvec",
  "winapi 0.3.9",
 ]
@@ -5504,9 +5820,9 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.11",
  "smallvec",
  "windows-sys",
 ]
@@ -5749,10 +6065,33 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad9940b913ee56ddd94aec2d3cd179dd47068236f42a1a6415ccf9d880ce2a61"
 dependencies = [
- "arrayvec",
+ "arrayvec 0.5.2",
  "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"
@@ -5813,7 +6152,7 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5986aa8d62380092d2f50f8b1cdba9cb9b6731ffd4b25b51fd126b6c3e05b99c"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "fnv",
  "lazy_static 1.4.0",
  "memchr",
@@ -5958,6 +6297,12 @@ 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"
@@ -6085,7 +6430,7 @@ dependencies = [
 [[package]]
 name = "read-write-set"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "move-binary-format",
@@ -6102,7 +6447,7 @@ dependencies = [
 [[package]]
 name = "read-write-set-dynamic"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
  "anyhow",
  "move-binary-format",
@@ -6112,6 +6457,12 @@ dependencies = [
  "workspace-hack",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.11"
@@ -6127,7 +6478,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f"
 dependencies = [
- "redox_syscall",
+ "redox_syscall 0.2.11",
 ]
 
 [[package]]
@@ -6137,7 +6488,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
  "getrandom 0.2.5",
- "redox_syscall",
+ "redox_syscall 0.2.11",
 ]
 
 [[package]]
@@ -6162,14 +6513,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.4.3"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local",
 ]
 
 [[package]]
@@ -6262,6 +6612,27 @@ 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.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
+]
+
 [[package]]
 name = "rocksdb"
 version = "0.17.0"
@@ -6388,6 +6759,12 @@ 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"
@@ -6482,6 +6859,31 @@ 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.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.19"
@@ -6530,7 +6932,7 @@ dependencies = [
  "aptos-types",
  "aptos-workspace-hack",
  "arc-swap",
- "bitvec",
+ "bitvec 0.19.6",
  "criterion",
  "itertools",
  "once_cell",
@@ -6815,7 +7217,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if",
+ "cfg-if 1.0.0",
  "cpufeatures",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
@@ -6827,7 +7229,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "cpufeatures",
  "digest 0.10.3",
 ]
@@ -6854,12 +7256,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if",
+ "cfg-if 1.0.0",
  "cpufeatures",
  "digest 0.9.0",
  "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"
@@ -7478,10 +7893,10 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "fastrand",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.11",
  "remove_dir_all",
  "winapi 0.3.9",
 ]
@@ -7535,7 +7950,7 @@ checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e"
 dependencies = [
  "libc",
  "numtoa",
- "redox_syscall",
+ "redox_syscall 0.2.11",
  "redox_termios",
 ]
 
@@ -7887,11 +8302,11 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f"
+checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "log",
  "pin-project-lite",
  "tracing-attributes",
@@ -7900,9 +8315,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.19"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716"
+checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b"
 dependencies = [
  "proc-macro2 1.0.36",
  "quote 1.0.15",
@@ -7911,9 +8326,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23"
+checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c"
 dependencies = [
  "lazy_static 1.4.0",
  "valuable",
@@ -7988,6 +8403,16 @@ 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"
@@ -8055,7 +8480,7 @@ version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "static_assertions",
 ]
 
@@ -8077,6 +8502,18 @@ 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"
@@ -8339,7 +8776,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983"
 dependencies = [
- "arrayvec",
+ "arrayvec 0.5.2",
  "utf8parse",
  "vte_generate_state_changes",
 ]
@@ -8427,13 +8864,19 @@ version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "wasm-bindgen-macro",
 ]
 
@@ -8458,7 +8901,7 @@ version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -8524,6 +8967,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "widestring"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
+
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -8616,31 +9065,38 @@ dependencies = [
 [[package]]
 name = "workspace-hack"
 version = "0.1.0"
-source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
+source = "git+https://github.com/diem/move?rev=8a260b82dda8175a98ea848fab5adcce467585b3#8a260b82dda8175a98ea848fab5adcce467585b3"
 dependencies = [
- "arrayvec",
+ "arrayvec 0.5.2",
  "block-buffer 0.9.0",
  "bstr",
  "byteorder",
+ "bytes",
  "codespan-reporting",
  "crossbeam-utils",
+ "crunchy",
+ "evm",
+ "evm-gasometer",
+ "evm-runtime",
  "getrandom 0.2.5",
+ "hex",
  "libc",
  "log",
  "memchr",
  "num-traits 0.2.14",
  "plotters",
+ "primitive-types",
  "proc-macro2 0.4.30",
- "proc-macro2 1.0.36",
  "quote 0.6.13",
- "quote 1.0.15",
  "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.86",
+ "tiny-keccak",
  "tracing-core",
 ]
 
diff --git a/api/Cargo.toml b/api/Cargo.toml
index 15f928e9bd1ba..48510735b7fea 100644
--- a/api/Cargo.toml
+++ b/api/Cargo.toml
@@ -33,8 +33,8 @@ aptos-types = { path = "../types" }
 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-resource-viewer = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-resource-viewer = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 
 [dev-dependencies]
 rand = "0.8.3"
diff --git a/api/types/Cargo.toml b/api/types/Cargo.toml
index da18bd4503c6a..8853ed0af2ff3 100644
--- a/api/types/Cargo.toml
+++ b/api/types/Cargo.toml
@@ -21,9 +21,9 @@ aptos-crypto = { path = "../../crates/aptos-crypto" }
 aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-resource-viewer = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-resource-viewer = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 
 [dev-dependencies]
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
diff --git a/aptos-move/aptos-resource-viewer/Cargo.toml b/aptos-move/aptos-resource-viewer/Cargo.toml
index 0faaf8b9af1b4..e287b3eba1d95 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-resource-viewer = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 aptos-types = { path = "../../types"  }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 
 anyhow = "1.0.52"
diff --git a/aptos-move/aptos-transaction-benchmarks/Cargo.toml b/aptos-move/aptos-transaction-benchmarks/Cargo.toml
index d6c526dcfc7f9..98e39c67779e2 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-read-write-set-dynamic = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+read-write-set = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+read-write-set-dynamic = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 aptos-vm = { path = "../aptos-vm" }
 diem-framework-releases = { path = "../framework/DPN/releases" }
 
diff --git a/aptos-move/aptos-transactional-test-harness/Cargo.toml b/aptos-move/aptos-transactional-test-harness/Cargo.toml
index e4b4c7737cf89..b659be515b441 100644
--- a/aptos-move/aptos-transactional-test-harness/Cargo.toml
+++ b/aptos-move/aptos-transactional-test-harness/Cargo.toml
@@ -20,11 +20,11 @@ bcs = "0.1.2"
 hex = "0.4.3"
 
 # Move dependencies
-move-transactional-test-runner = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-transactional-test-runner = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-compiler = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-command-line-common = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 
 # Diem-Move dependencies
 language-e2e-tests = { path = "../e2e-tests" }
diff --git a/aptos-move/aptos-transactional-test-harness/src/diem_test_harness.rs b/aptos-move/aptos-transactional-test-harness/src/diem_test_harness.rs
index c7187e5a2bb39..a94317373b19d 100644
--- a/aptos-move/aptos-transactional-test-harness/src/diem_test_harness.rs
+++ b/aptos-move/aptos-transactional-test-harness/src/diem_test_harness.rs
@@ -28,8 +28,9 @@ use aptos_types::{
 use aptos_vm::AptosVM;
 use language_e2e_tests::data_store::{FakeDataStore, GENESIS_CHANGE_SET_FRESH};
 use move_binary_format::file_format::{CompiledModule, CompiledScript};
+use move_command_line_common::files::verify_and_create_named_address_mapping;
 use move_compiler::{
-    shared::{verify_and_create_named_address_mapping, NumberFormat, NumericalAddress},
+    shared::{NumberFormat, NumericalAddress},
     FullyCompiledProgram,
 };
 use move_core_types::{
@@ -355,11 +356,14 @@ fn panic_missing_private_key(cmd_name: &str) -> ! {
 }
 
 static PRECOMPILED_DIEM_FRAMEWORK: Lazy<FullyCompiledProgram> = Lazy::new(|| {
+    let deps = vec![(
+        framework::dpn_files(),
+        framework::diem_framework_named_addresses(),
+    )];
     let program_res = move_compiler::construct_pre_compiled_lib(
-        &framework::dpn_files(),
+        deps,
         None,
         move_compiler::Flags::empty().set_sources_shadow_deps(false),
-        framework::diem_framework_named_addresses(),
     )
     .unwrap();
     match program_res {
@@ -372,11 +376,14 @@ static PRECOMPILED_DIEM_FRAMEWORK: Lazy<FullyCompiledProgram> = Lazy::new(|| {
 });
 
 static PRECOMPILED_APTOS_FRAMEWORK: Lazy<FullyCompiledProgram> = Lazy::new(|| {
+    let deps = vec![(
+        framework::aptos_files(),
+        framework::aptos_framework_named_addresses(),
+    )];
     let program_res = move_compiler::construct_pre_compiled_lib(
-        &framework::aptos_files(),
+        deps,
         None,
         move_compiler::Flags::empty().set_sources_shadow_deps(false),
-        framework::aptos_framework_named_addresses(),
     )
     .unwrap();
     match program_res {
diff --git a/aptos-move/aptos-validator-interface/Cargo.toml b/aptos-move/aptos-validator-interface/Cargo.toml
index 737fde06a8d3d..ed2b7122c73ca 100644
--- a/aptos-move/aptos-validator-interface/Cargo.toml
+++ b/aptos-move/aptos-validator-interface/Cargo.toml
@@ -18,5 +18,5 @@ aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 storage-interface = { path = "../../storage/storage-interface" }
 scratchpad = { path = "../../storage/scratchpad" }
 aptos-state-view = { path = "../../storage/state-view" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 bcs = "0.1.2"
diff --git a/aptos-move/aptos-vm/Cargo.toml b/aptos-move/aptos-vm/Cargo.toml
index a9f7a5b0e2514..6d1123ec82047 100644
--- a/aptos-move/aptos-vm/Cargo.toml
+++ b/aptos-move/aptos-vm/Cargo.toml
@@ -24,16 +24,16 @@ aptos-metrics = { path = "../../crates/aptos-metrics" }
 aptos-state-view = { path = "../../storage/state-view" }
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-runtime = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-bytecode-utils = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-stdlib = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-runtime = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-bytecode-utils = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-stdlib = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 framework =  { path = "../framework" }
 serde_json = "1.0.64"
 serde = { version = "1.0.124", default-features = false }
-read-write-set-dynamic = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860"}
+read-write-set-dynamic = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3"}
 
 mvhashmap = { path = "../mvhashmap" }
 aptos-parallel-executor = {path = "../parallel-executor" }
diff --git a/aptos-move/df-cli/Cargo.toml b/aptos-move/df-cli/Cargo.toml
index 3d048bf657b68..c527805a6c3e3 100644
--- a/aptos-move/df-cli/Cargo.toml
+++ b/aptos-move/df-cli/Cargo.toml
@@ -15,8 +15,9 @@ bcs = "0.1.2"
 structopt = "0.3.21"
 
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-cli = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-cli = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 aptos-vm = { path = "../aptos-vm" }
 diem-framework-releases = { path = "../framework/DPN/releases" }
 
diff --git a/aptos-move/df-cli/src/main.rs b/aptos-move/df-cli/src/main.rs
index 5dff51ae143a6..289d12d807e86 100644
--- a/aptos-move/df-cli/src/main.rs
+++ b/aptos-move/df-cli/src/main.rs
@@ -4,6 +4,7 @@
 use anyhow::Result;
 use move_cli::{Command, Move};
 use move_core_types::errmap::ErrorMapping;
+use move_vm_types::gas_schedule::INITIAL_COST_SCHEDULE;
 use structopt::StructOpt;
 
 #[derive(StructOpt)]
@@ -29,6 +30,7 @@ fn main() -> Result<()> {
     match &args.cmd {
         DfCommands::Command(cmd) => move_cli::run_cli(
             aptos_vm::natives::aptos_natives(),
+            &INITIAL_COST_SCHEDULE,
             &error_descriptions,
             &args.move_args,
             cmd,
diff --git a/aptos-move/e2e-tests-replay/Cargo.toml b/aptos-move/e2e-tests-replay/Cargo.toml
index 7a1103ec7425c..31d88ba3a3d33 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-stackless-bytecode-interpreter = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-model = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-runtime = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-model = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-runtime = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
diff --git a/aptos-move/e2e-tests/Cargo.toml b/aptos-move/e2e-tests/Cargo.toml
index 64d4650dfd7d7..bec3643dd9865 100644
--- a/aptos-move/e2e-tests/Cargo.toml
+++ b/aptos-move/e2e-tests/Cargo.toml
@@ -21,13 +21,13 @@ hex = "0.4.3"
 serde = { version = "1.0.124", default-features = false }
 
 ## Move dependencies
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-ir-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-runtime = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-read-write-set = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-ir-compiler = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-runtime = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+read-write-set = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-command-line-common = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 
 ## Diem-Move dependencies
 aptos-writeset-generator = { path = "../writeset-transaction-generator" }
diff --git a/aptos-move/e2e-testsuite/Cargo.toml b/aptos-move/e2e-testsuite/Cargo.toml
index 3400892b2f0e2..2386e46676f24 100644
--- a/aptos-move/e2e-testsuite/Cargo.toml
+++ b/aptos-move/e2e-testsuite/Cargo.toml
@@ -16,13 +16,13 @@ bcs = "0.1.2"
 proptest = "1.0.0"
 
 ## Move dependencies
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-ir-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-runtime = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-read-write-set = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-ir-compiler = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-runtime = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+read-write-set = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 
 ## Diem-Move dependencies
 language-e2e-tests = { path = "../e2e-tests" }
diff --git a/aptos-move/e2e-testsuite/src/tests/failed_transaction_tests.rs b/aptos-move/e2e-testsuite/src/tests/failed_transaction_tests.rs
index a14038ad8933e..58afecfe53b2e 100644
--- a/aptos-move/e2e-testsuite/src/tests/failed_transaction_tests.rs
+++ b/aptos-move/e2e-testsuite/src/tests/failed_transaction_tests.rs
@@ -11,6 +11,7 @@ use language_e2e_tests::{
     account, common_transactions::peer_to_peer_txn, test_with_different_versions,
     versioning::CURRENT_RELEASE_VERSIONS,
 };
+use move_binary_format::file_format::NUMBER_OF_NATIVE_FUNCTIONS;
 use move_core_types::gas_schedule::{GasAlgebra, GasPrice, GasUnits};
 use move_vm_types::gas_schedule::{zero_cost_schedule, GasStatus};
 
@@ -33,7 +34,7 @@ fn failed_transaction_cleanup_test() {
             ..Default::default()
         };
 
-        let gas_schedule = zero_cost_schedule();
+        let gas_schedule = zero_cost_schedule(NUMBER_OF_NATIVE_FUNCTIONS);
         let mut gas_status = GasStatus::new(&gas_schedule, GasUnits::new(10_000));
 
         // TYPE_MISMATCH should be kept and charged.
diff --git a/aptos-move/framework/Cargo.toml b/aptos-move/framework/Cargo.toml
index 3ae155636b563..de289b4bd044c 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-abigen = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-docgen = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-errmapgen = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-prover = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-abigen = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-docgen = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-command-line-common = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-errmapgen = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-compiler = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-prover = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 transaction-builder-generator = { path = "../transaction-builder-generator" }
-move-stdlib = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-symbol-pool = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-runtime = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-package = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-bytecode-utils = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-stdlib = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-symbol-pool = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-runtime = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-package = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-bytecode-utils = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 
 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-unit-test = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-cli = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-unit-test = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 aptos-transactional-test-harness = { path = "../aptos-transactional-test-harness" }
 
 dir-diff = "0.3.2"
diff --git a/aptos-move/framework/DPN/releases/Cargo.toml b/aptos-move/framework/DPN/releases/Cargo.toml
index 74a8ba6de7e9a..98164b1f3fdbb 100644
--- a/aptos-move/framework/DPN/releases/Cargo.toml
+++ b/aptos-move/framework/DPN/releases/Cargo.toml
@@ -11,11 +11,11 @@ publish = false
 
 
 [dependencies]
-move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-command-line-common = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 framework-releases = { path = "../../releases" }
 
 anyhow = "1.0.52"
@@ -24,4 +24,4 @@ bcs = "0.1.2"
 once_cell = "1.7.2"
 
 [dev-dependencies]
-move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
diff --git a/aptos-move/framework/aptos-framework/releases/Cargo.toml b/aptos-move/framework/aptos-framework/releases/Cargo.toml
index ad04795f2933e..1816f525c87b2 100644
--- a/aptos-move/framework/aptos-framework/releases/Cargo.toml
+++ b/aptos-move/framework/aptos-framework/releases/Cargo.toml
@@ -11,11 +11,11 @@ publish = false
 
 
 [dependencies]
-move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-command-line-common = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 framework-releases = { path = "../../releases" }
 
 anyhow = "1.0.52"
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosAccount.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosAccount.mv
index 087ba0a3fb841..ea8c2ff99458d 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosAccount.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosAccount.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosTransactionPublishingOption.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosTransactionPublishingOption.mv
index 45dee0faba20a..8e9b1453ce136 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosTransactionPublishingOption.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosTransactionPublishingOption.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVMConfig.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVMConfig.mv
index 7f13a69202460..63a3e5014df1a 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVMConfig.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVMConfig.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorSet.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorSet.mv
index ca6cde2c79e92..20bda4dad6ad6 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorSet.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorSet.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVersion.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVersion.mv
index 341aa9202bb26..7d77d4f6757a4 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVersion.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVersion.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/Genesis.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/Genesis.mv
index 132132895919c..34e49ebf55b93 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/Genesis.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/Genesis.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/TestCoin.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/TestCoin.mv
index 2466227032741..2f19f62f9d8ee 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/TestCoin.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/TestCoin.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Account.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Account.mv
index 704515a408906..03ab88e46f2d9 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Account.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Account.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Block.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Block.mv
index 16d8a9f7c7408..f9976236f96dd 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Block.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Block.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ChainId.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ChainId.mv
index 1bd9394ab8d9a..4af70c550bd36 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ChainId.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ChainId.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/CoreGenesis.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/CoreGenesis.mv
index 54a8b02d356f5..c05f36034fe5a 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/CoreGenesis.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/CoreGenesis.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Reconfiguration.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Reconfiguration.mv
index e36a6b2444a60..dc6b65547d7e4 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Reconfiguration.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Reconfiguration.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/SystemAddresses.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/SystemAddresses.mv
index 7a848c08d53de..3ede0a93d537e 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/SystemAddresses.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/SystemAddresses.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Timestamp.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Timestamp.mv
index 38c1e1b309770..e9b25e2e47e95 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Timestamp.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Timestamp.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/TransactionPublishingOption.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/TransactionPublishingOption.mv
index d34961b4e02d7..b2db01d9327db 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/TransactionPublishingOption.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/TransactionPublishingOption.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/VMConfig.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/VMConfig.mv
index 9499d2155cda5..a9312ca5eda2b 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/VMConfig.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/VMConfig.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ValidatorConfig.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ValidatorConfig.mv
index c3c3c224d64aa..431eebd9ae1a6 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ValidatorConfig.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ValidatorConfig.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ValidatorOperatorConfig.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ValidatorOperatorConfig.mv
index 0ec791c074f9d..800d570171239 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ValidatorOperatorConfig.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ValidatorOperatorConfig.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ValidatorSystem.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ValidatorSystem.mv
index 73fdd3720bb87..c23afa8da03eb 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ValidatorSystem.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/ValidatorSystem.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Version.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Version.mv
index 3b33a98f52d3b..03a7b3df98d68 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Version.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/CoreFramework/bytecode_modules/Version.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv
index 8783b9f5ce3d2..f42164315fda1 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv
index e72de1650338e..7fe3805043207 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv
index 063ef2ac24739..afd4423b2c78f 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv
index adf341e824e23..5357456701f7d 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv
index bd6edf5068ce0..48e571b2b696f 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv
index b90d701a39aba..6bbe305dae5f9 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv differ
diff --git a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv
index e15da36a8d6a6..848d4d5c843b5 100644
Binary files a/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv and b/aptos-move/framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv differ
diff --git a/aptos-move/framework/experimental/releases/Cargo.toml b/aptos-move/framework/experimental/releases/Cargo.toml
index fa13c546589dc..48d9ea4a093f5 100644
--- a/aptos-move/framework/experimental/releases/Cargo.toml
+++ b/aptos-move/framework/experimental/releases/Cargo.toml
@@ -11,11 +11,11 @@ publish = false
 
 
 [dependencies]
-move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-command-line-common = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 framework-releases = { path = "../../releases" }
 
 anyhow = "1.0.52"
diff --git a/aptos-move/framework/releases/Cargo.toml b/aptos-move/framework/releases/Cargo.toml
index 116c1ad41fe9a..3cd309aa361ca 100644
--- a/aptos-move/framework/releases/Cargo.toml
+++ b/aptos-move/framework/releases/Cargo.toml
@@ -10,17 +10,17 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-compiler = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 aptos-types = { path = "../../../types" }
 aptos-workspace-hack = { path = "../../../crates/aptos-workspace-hack" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-runtime = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-bytecode-utils = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-package = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-runtime = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-bytecode-utils = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-command-line-common = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-package = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 
 bcs = "0.1.2"
 anyhow = "1.0.52"
diff --git a/aptos-move/genesis-viewer/Cargo.toml b/aptos-move/genesis-viewer/Cargo.toml
index e72ee1849767d..28abaa74ff759 100644
--- a/aptos-move/genesis-viewer/Cargo.toml
+++ b/aptos-move/genesis-viewer/Cargo.toml
@@ -13,11 +13,11 @@ edition = "2018"
 bcs = "0.1.2"
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 aptos-resource-viewer = { path = "../aptos-resource-viewer"}
 vm-genesis = { path = "../vm-genesis" }
 diem-framework-releases = { path = "../framework/DPN/releases" }
-move-vm-test-utils = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-vm-test-utils = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 
 structopt = "0.3.21"
diff --git a/aptos-move/move-examples/Cargo.toml b/aptos-move/move-examples/Cargo.toml
index e8aa29df29040..a01fe349460d6 100644
--- a/aptos-move/move-examples/Cargo.toml
+++ b/aptos-move/move-examples/Cargo.toml
@@ -13,7 +13,7 @@ aptos-vm = { path = "../aptos-vm" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 framework = { path = "../framework" }
 structopt = "0.3.21"
-move-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-package = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-stdlib = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-unit-test = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-compiler = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-package = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-stdlib = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-unit-test = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
diff --git a/aptos-move/transaction-builder-generator/Cargo.toml b/aptos-move/transaction-builder-generator/Cargo.toml
index 5693a012aaa38..777ac6e4d06d7 100644
--- a/aptos-move/transaction-builder-generator/Cargo.toml
+++ b/aptos-move/transaction-builder-generator/Cargo.toml
@@ -12,14 +12,14 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.52"
 heck = "0.3.2"
-regex = "1.4.3"
+regex = "1.5.5"
 structopt = "0.3.21"
 textwrap = "0.13.4"
 serde_yaml = "0.8.17"
 
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 serde-reflection = "0.3.5"
 serde-generate = "0.20.6"
 bcs = "0.1.2"
diff --git a/aptos-move/transaction-replay/Cargo.toml b/aptos-move/transaction-replay/Cargo.toml
index d0158594e03eb..7cd758b06efa6 100644
--- a/aptos-move/transaction-replay/Cargo.toml
+++ b/aptos-move/transaction-replay/Cargo.toml
@@ -19,15 +19,15 @@ aptos-state-view = { path = "../../storage/state-view" }
 aptos-validator-interface = { path = "../aptos-validator-interface" }
 aptosdb = { path = "../../storage/aptosdb" }
 aptos-vm = { path = "../aptos-vm" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860"}
-move-cli = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-runtime = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-test-utils = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3"}
+move-cli = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-runtime = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-test-utils = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 aptos-resource-viewer = { path = "../aptos-resource-viewer" }
 framework =  { path = "../framework" }
-move-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-compiler = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 bcs = "0.1.2"
 difference = "2.0.0"
 
diff --git a/aptos-move/transaction-replay/src/lib.rs b/aptos-move/transaction-replay/src/lib.rs
index 3844206099964..b160ebf3e4193 100644
--- a/aptos-move/transaction-replay/src/lib.rs
+++ b/aptos-move/transaction-replay/src/lib.rs
@@ -400,10 +400,14 @@ fn is_reconfiguration(vm_output: &TransactionOutput) -> bool {
 
 fn compile_move_script(file_path: &str) -> Result<Vec<u8>> {
     let cur_path = file_path.to_owned();
-    let targets = &vec![cur_path];
-    let (files, units_or_diags) = Compiler::new(targets, &framework::dpn_files())
+    let targets = vec![(vec![cur_path], framework::diem_framework_named_addresses())];
+    let deps = vec![(
+        framework::dpn_files(),
+        framework::diem_framework_named_addresses(),
+    )];
+
+    let (files, units_or_diags) = Compiler::new(targets, deps)
         .set_flags(Flags::empty().set_sources_shadow_deps(false))
-        .set_named_address_values(framework::diem_framework_named_addresses())
         .build()?;
     let unit = match units_or_diags {
         Err(diags) => {
diff --git a/aptos-move/vm-genesis/Cargo.toml b/aptos-move/vm-genesis/Cargo.toml
index 1e017c8554bad..31134eee230f8 100644
--- a/aptos-move/vm-genesis/Cargo.toml
+++ b/aptos-move/vm-genesis/Cargo.toml
@@ -14,23 +14,23 @@ anyhow = "1.0.52"
 once_cell = "1.7.2"
 rand = "0.8.3"
 
-move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 bcs = "0.1.2"
 aptos-config = { path = "../../config" }
 aptos-crypto = { path = "../../crates/aptos-crypto" }
 aptos-state-view = { path = "../../storage/state-view" }
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
-move-bytecode-utils = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-runtime = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860"}
-move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-bytecode-utils = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-runtime = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3"}
+move-vm-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 framework =  { path = "../framework" }
 diem-framework-releases = { path = "../framework/DPN/releases" }
 aptos-transaction-builder = { path = "../../sdk/transaction-builder"}
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 aptos-vm = { path = "../aptos-vm" }
-read-write-set = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+read-write-set = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 
 [dev-dependencies]
 proptest = "1.0.0"
diff --git a/aptos-move/vm-genesis/src/lib.rs b/aptos-move/vm-genesis/src/lib.rs
index c9940d3398e3f..d9194239e1e4e 100644
--- a/aptos-move/vm-genesis/src/lib.rs
+++ b/aptos-move/vm-genesis/src/lib.rs
@@ -40,7 +40,7 @@ use move_core_types::{
     value::{serialize_values, MoveValue},
 };
 use move_vm_runtime::{move_vm::MoveVM, session::Session};
-use move_vm_types::gas_schedule::{GasStatus, INITIAL_GAS_SCHEDULE};
+use move_vm_types::gas_schedule::{GasStatus, INITIAL_COST_SCHEDULE};
 use once_cell::sync::Lazy;
 use rand::prelude::*;
 use transaction_builder::encode_create_designated_dealer_script_function;
@@ -239,7 +239,7 @@ fn create_and_initialize_main_accounts(
             .collect(),
     );
 
-    let genesis_gas_schedule = &INITIAL_GAS_SCHEDULE;
+    let genesis_gas_schedule = &INITIAL_COST_SCHEDULE;
     let instr_gas_costs = bcs::to_bytes(&genesis_gas_schedule.instruction_table)
         .expect("Failure serializing genesis instr gas costs");
     let native_gas_costs = bcs::to_bytes(&genesis_gas_schedule.native_table)
diff --git a/aptos-move/writeset-transaction-generator/Cargo.toml b/aptos-move/writeset-transaction-generator/Cargo.toml
index 9331ac6c914e3..8682390a364fc 100644
--- a/aptos-move/writeset-transaction-generator/Cargo.toml
+++ b/aptos-move/writeset-transaction-generator/Cargo.toml
@@ -21,22 +21,22 @@ serde = { version = "1.0.124", default-features = false }
 serde_json = "1.0.64"
 once_cell = "1.7.2"
 
-move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive" }
 aptos-crypto = { path = "../../crates/aptos-crypto" }
 aptos-types = { path = "../../types" }
 diem-framework-releases = { path = "../framework/DPN/releases" }
 framework =  { path = "../framework" }
-move-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-compiler = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 bcs = "0.1.2"
 aptos-state-view = { path = "../../storage/state-view" }
 aptos-transaction-replay = { path = "../transaction-replay" }
 aptosdb = { path = "../../storage/aptosdb" }
 aptos-vm = { path = "../aptos-vm" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860"}
-move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-runtime = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-vm-test-utils = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-read-write-set = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3"}
+move-vm-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-runtime = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-vm-test-utils = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+read-write-set = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
diff --git a/aptos-move/writeset-transaction-generator/src/admin_script_builder.rs b/aptos-move/writeset-transaction-generator/src/admin_script_builder.rs
index 372100682eb6a..f8ec764555392 100644
--- a/aptos-move/writeset-transaction-generator/src/admin_script_builder.rs
+++ b/aptos-move/writeset-transaction-generator/src/admin_script_builder.rs
@@ -20,9 +20,16 @@ use tempfile::NamedTempFile;
 pub const SCRIPTS_DIR_PATH: &str = "templates";
 
 pub fn compile_script(source_file_str: String) -> Vec<u8> {
-    let (_files, mut compiled_program) = Compiler::new(&[source_file_str], &framework::dpn_files())
+    let targets = vec![(
+        vec![source_file_str],
+        framework::diem_framework_named_addresses(),
+    )];
+    let deps = vec![(
+        framework::dpn_files(),
+        framework::diem_framework_named_addresses(),
+    )];
+    let (_files, mut compiled_program) = Compiler::new(targets, deps)
         .set_flags(Flags::empty().set_sources_shadow_deps(false))
-        .set_named_address_values(framework::diem_framework_named_addresses())
         .build_and_report()
         .unwrap();
     assert!(compiled_program.len() == 1);
diff --git a/crates/aptos-rest-client/Cargo.toml b/crates/aptos-rest-client/Cargo.toml
index e65ae6ed29508..ebcefaabee6da 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
diff --git a/crates/aptos-workspace-hack/Cargo.toml b/crates/aptos-workspace-hack/Cargo.toml
index 17e227cade675..80b7537e922c5 100644
--- a/crates/aptos-workspace-hack/Cargo.toml
+++ b/crates/aptos-workspace-hack/Cargo.toml
@@ -41,7 +41,7 @@ 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.4.3", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "thread_local", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
+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"] }
 reqwest = { version = "0.11.9", 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"] }
@@ -53,7 +53,7 @@ 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", "winapi"] }
 tokio-util = { version = "0.6.9", features = ["codec", "compat", "futures-io", "io"] }
 toml = { version = "0.5.8" }
-tracing = { version = "0.1.31", features = ["attributes", "log", "std", "tracing-attributes"] }
+tracing = { version = "0.1.32", features = ["attributes", "log", "std", "tracing-attributes"] }
 warp = { version = "0.3.2", features = ["multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] }
 zeroize = { version = "1.5.3", features = ["alloc", "zeroize_derive"] }
 
@@ -89,7 +89,7 @@ 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.4.3", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "thread_local", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
+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"] }
 reqwest = { version = "0.11.9", 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"] }
@@ -98,11 +98,11 @@ serde_json = { version = "1.0.79", features = ["indexmap", "preserve_order", "st
 sha-1 = { version = "0.9.8", features = ["std"] }
 standback = { version = "0.2.17", default-features = false, features = ["std"] }
 subtle = { version = "2.4.1", default-features = false, features = ["std"] }
-syn = { version = "1.0.86", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
+syn = { version = "1.0.86", features = ["clone-impls", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
 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", "winapi"] }
 tokio-util = { version = "0.6.9", features = ["codec", "compat", "futures-io", "io"] }
 toml = { version = "0.5.8" }
-tracing = { version = "0.1.31", features = ["attributes", "log", "std", "tracing-attributes"] }
+tracing = { version = "0.1.32", features = ["attributes", "log", "std", "tracing-attributes"] }
 warp = { version = "0.3.2", features = ["multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] }
 zeroize = { version = "1.5.3", features = ["alloc", "zeroize_derive"] }
 
diff --git a/devtools/x/Cargo.toml b/devtools/x/Cargo.toml
index a88d80493108e..8e701f67c4998 100644
--- a/devtools/x/Cargo.toml
+++ b/devtools/x/Cargo.toml
@@ -24,7 +24,7 @@ env_logger = "0.8.3"
 log = "0.4.14"
 chrono = "0.4.19"
 globset = "0.4.6"
-regex = "1.4.3"
+regex = "1.5.5"
 rayon = "1.5.0"
 nextest-config = { git = "https://github.com/diem/diem-devtools", rev = "f99a204e3d3f8e503d51d7df42e55c8282b59154" }
 nextest-runner = { git = "https://github.com/diem/diem-devtools", rev = "f99a204e3d3f8e503d51d7df42e55c8282b59154" }
diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml
index 0438d68ada796..be6444d9b5548 100644
--- a/execution/executor/Cargo.toml
+++ b/execution/executor/Cargo.toml
@@ -28,7 +28,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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 aptos-vm = { path = "../../aptos-move/aptos-vm" }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
 scratchpad = { path = "../../storage/scratchpad" }
@@ -46,7 +46,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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-ir-compiler = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 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 adbce68d97f22..7c8255040a099 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 network = {path = "../../network"}
 short-hex-str = { path = "../../crates/short-hex-str" }
 
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
index 809090d6b08be..358d8a35717f5 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", version = "0.0.3" }
 aptos-types = { path = "../types", version = "0.0.3"}
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", version = "0.0.3" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3", version = "0.0.3" }
 aptos-transaction-builder = { path = "./transaction-builder", version = "0.0.3" }
 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 bed59e53d16d2..3ccb36ec52212 100644
--- a/sdk/transaction-builder/Cargo.toml
+++ b/sdk/transaction-builder/Cargo.toml
@@ -15,7 +15,7 @@ bcs = "0.1.2"
 once_cell = "1.7.2"
 serde = { version = "1.0.124", features = ["derive"] }
 
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", version = "0.0.3" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3", version = "0.0.3" }
 aptos-types = { path = "../../types", version = "0.0.3" }
 
 proptest = { version = "1.0.0", optional = true }
@@ -25,7 +25,7 @@ aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-h
 [dev-dependencies]
 proptest = "1.0.0"
 proptest-derive = "0.3.0"
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", features = ["fuzzing"] }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3", features = ["fuzzing"] }
 
 [features]
 default = []
diff --git a/state-sync/inter-component/consensus-notifications/Cargo.toml b/state-sync/inter-component/consensus-notifications/Cargo.toml
index 0b20f0d3e7781..55778bc94523e 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
diff --git a/state-sync/inter-component/event-notifications/Cargo.toml b/state-sync/inter-component/event-notifications/Cargo.toml
index eb42b302bc02b..bc4bb65549192 100644
--- a/state-sync/inter-component/event-notifications/Cargo.toml
+++ b/state-sync/inter-component/event-notifications/Cargo.toml
@@ -34,5 +34,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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 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 0925a0e25633c..613dcefaee5f2 100644
--- a/state-sync/state-sync-v1/Cargo.toml
+++ b/state-sync/state-sync-v1/Cargo.toml
@@ -63,7 +63,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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 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 d453feaaaa97c..6aa94df2e1eb9 100644
--- a/state-sync/storage-service/server/Cargo.toml
+++ b/state-sync/storage-service/server/Cargo.toml
@@ -35,5 +35,5 @@ claim = "0.5.0"
 
 aptos-crypto = { path = "../../../crates/aptos-crypto" }
 aptos-types = { path = "../../../types" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 storage-interface = { path = "../../../storage/storage-interface" }
diff --git a/storage/aptosdb/Cargo.toml b/storage/aptosdb/Cargo.toml
index 3c97c00d58a71..f25dbfa2ca023 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860"}
+move-core-types = {git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3"}
 
 num-variants = { path = "../../crates/num-variants" }
 schemadb = { path = "../schemadb" }
diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml
index 2aa89f1504b04..b0df442fde328 100644
--- a/storage/backup/backup-cli/Cargo.toml
+++ b/storage/backup/backup-cli/Cargo.toml
@@ -20,7 +20,7 @@ num_cpus = "1.13.0"
 once_cell = "1.7.2"
 pin-project = "1.0.5"
 rand = "0.8.3"
-regex = "1.4.3"
+regex = "1.5.5"
 reqwest = { version = "0.11.2", features = ["stream"], default-features = false }
 serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0.64"
diff --git a/storage/backup/backup-cli/src/storage/mod.rs b/storage/backup/backup-cli/src/storage/mod.rs
index 45c173e2ef35b..b4fc0909d779f 100644
--- a/storage/backup/backup-cli/src/storage/mod.rs
+++ b/storage/backup/backup-cli/src/storage/mod.rs
@@ -43,13 +43,13 @@ pub type FileHandleRef = str;
 /// Through this, the backup controller promises to the storage the names passed to
 /// `create_backup()` and `create_for_write()` don't contain funny characters tricky to deal with
 /// in shell commands.
-/// Specifically, names follow the pattern "\A[a-zA-Z0-9][a-zA-Z0-9._-]{0,126}\z"
+/// Specifically, names follow the pattern "\A[a-zA-Z0-9][a-zA-Z0-9._-]{2,126}\z"
 #[cfg_attr(test, derive(Hash, Eq, PartialEq))]
 #[derive(Debug)]
 pub struct ShellSafeName(String);
 
 impl ShellSafeName {
-    const PATTERN: &'static str = r"\A[a-zA-Z0-9][a-zA-Z0-9._-]{0,126}\z";
+    const PATTERN: &'static str = r"\A[a-zA-Z0-9][a-zA-Z0-9._-]{2,126}\z";
 
     fn sanitize(name: &str) -> Result<()> {
         static RE: Lazy<Regex> = Lazy::new(|| Regex::new(ShellSafeName::PATTERN).unwrap());
diff --git a/storage/storage-interface/Cargo.toml b/storage/storage-interface/Cargo.toml
index f39088c35cd6c..243e06e5b20e4 100644
--- a/storage/storage-interface/Cargo.toml
+++ b/storage/storage-interface/Cargo.toml
@@ -23,7 +23,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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 
 [features]
 default = []
diff --git a/testsuite/aptos-fuzzer/Cargo.toml b/testsuite/aptos-fuzzer/Cargo.toml
index 02b5adbc19f1a..88be73644e161 100644
--- a/testsuite/aptos-fuzzer/Cargo.toml
+++ b/testsuite/aptos-fuzzer/Cargo.toml
@@ -41,14 +41,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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", features = ["fuzzing"] }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", features = ["fuzzing"] }
+move-vm-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3", features = ["fuzzing"] }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3", features = ["fuzzing"] }
 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", features = ["fuzzing"] }
+move-binary-format = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3", features = ["fuzzing"] }
 
 [dev-dependencies]
 rusty-fork = "0.3.0"
diff --git a/testsuite/forge/Cargo.toml b/testsuite/forge/Cargo.toml
index 762b0c673bbbb..47e9c2787eacf 100644
--- a/testsuite/forge/Cargo.toml
+++ b/testsuite/forge/Cargo.toml
@@ -23,7 +23,7 @@ kube = "0.51.0"
 rand = "0.8.3"
 rand_core = "0.6.2"
 rayon = "1.5.0"
-regex = "1.4.3"
+regex = "1.5.5"
 reqwest = { version = "0.11.2", features = ["blocking", "json"] }
 rusoto_core = "0.46.0"
 rusoto_credential = "0.46.0"
diff --git a/testsuite/generate-format/Cargo.toml b/testsuite/generate-format/Cargo.toml
index 056d356c26c00..87aaf07835724 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", features=["fuzzing"] }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3", features=["fuzzing"] }
 
 [[bin]]
 name = "compute"
diff --git a/testsuite/generate-format/src/aptos.rs b/testsuite/generate-format/src/aptos.rs
index 6868849ec51d4..e48782e58d26b 100644
--- a/testsuite/generate-format/src/aptos.rs
+++ b/testsuite/generate-format/src/aptos.rs
@@ -1,6 +1,7 @@
 // Copyright (c) The Diem Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::language_storage;
 use aptos_crypto::{
     ed25519::{Ed25519PrivateKey, Ed25519PublicKey},
     hash::{CryptoHasher as _, TestOnlyHasher},
@@ -9,7 +10,6 @@ use aptos_crypto::{
 };
 use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher};
 use aptos_types::{contract_event, event, transaction, write_set};
-use move_core_types::language_storage;
 use rand::{rngs::StdRng, SeedableRng};
 use serde::{Deserialize, Serialize};
 use serde_reflection::{Registry, Result, Samples, Tracer, TracerConfig};
diff --git a/testsuite/generate-format/src/consensus.rs b/testsuite/generate-format/src/consensus.rs
index cabe756f2ce12..b04931436c758 100644
--- a/testsuite/generate-format/src/consensus.rs
+++ b/testsuite/generate-format/src/consensus.rs
@@ -1,6 +1,7 @@
 // Copyright (c) The Diem Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::language_storage;
 use aptos_crypto::{
     ed25519::{Ed25519PrivateKey, Ed25519PublicKey},
     multi_ed25519::{MultiEd25519PublicKey, MultiEd25519Signature},
@@ -8,7 +9,6 @@ use aptos_crypto::{
 };
 use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher};
 use aptos_types::{contract_event, event, transaction, write_set};
-use move_core_types::language_storage;
 use rand::{rngs::StdRng, SeedableRng};
 use serde::{Deserialize, Serialize};
 use serde_reflection::{Registry, Result, Samples, Tracer, TracerConfig};
diff --git a/testsuite/generate-format/src/language_storage.rs b/testsuite/generate-format/src/language_storage.rs
new file mode 100644
index 0000000000000..ec01234c6c80e
--- /dev/null
+++ b/testsuite/generate-format/src/language_storage.rs
@@ -0,0 +1,68 @@
+// Copyright (c) The Diem Core Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use serde::{Deserialize, Serialize};
+use std::fmt::{Display, Formatter};
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Hash, Eq, Clone, PartialOrd, Ord)]
+pub enum TypeTag {
+    Bool,
+    U8,
+    U64,
+    U128,
+    Address,
+    Signer,
+    Vector(Box<TypeTag>),
+    Struct(StructTag),
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Hash, Eq, Clone, PartialOrd, Ord)]
+pub struct StructTag {
+    pub address: AccountAddress,
+    pub module: Identifier,
+    pub name: Identifier,
+    pub type_params: Vec<TypeTag>,
+}
+
+impl Display for StructTag {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "0x{}::{}::{}",
+            self.address.short_str_lossless(),
+            self.module,
+            self.name
+        )?;
+        if let Some(first_ty) = self.type_params.first() {
+            write!(f, "<")?;
+            write!(f, "{}", first_ty)?;
+            for ty in self.type_params.iter().skip(1) {
+                write!(f, ", {}", ty)?;
+            }
+            write!(f, ">")?;
+        }
+        Ok(())
+    }
+}
+
+impl Display for TypeTag {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        match self {
+            TypeTag::Struct(s) => write!(f, "{}", s),
+            TypeTag::Vector(ty) => write!(f, "vector<{}>", ty),
+            TypeTag::U8 => write!(f, "U8"),
+            TypeTag::U64 => write!(f, "U64"),
+            TypeTag::U128 => write!(f, "U128"),
+            TypeTag::Address => write!(f, "Address"),
+            TypeTag::Signer => write!(f, "Signer"),
+            TypeTag::Bool => write!(f, "Bool"),
+        }
+    }
+}
+
+impl From<StructTag> for TypeTag {
+    fn from(t: StructTag) -> TypeTag {
+        TypeTag::Struct(t)
+    }
+}
diff --git a/testsuite/generate-format/src/lib.rs b/testsuite/generate-format/src/lib.rs
index 9203aaa44cf1a..e9dd3ad7776ee 100644
--- a/testsuite/generate-format/src/lib.rs
+++ b/testsuite/generate-format/src/lib.rs
@@ -12,6 +12,8 @@ use structopt::{clap::arg_enum, StructOpt};
 mod aptos;
 /// Consensus messages.
 mod consensus;
+/// new file added as a workaround for https://github.com/diem/move/pull/127
+mod language_storage;
 /// Analyze Serde formats to detect certain patterns.
 mod linter;
 /// Move ABI.
diff --git a/testsuite/generate-format/src/move_abi.rs b/testsuite/generate-format/src/move_abi.rs
index 41aa101dcc5b2..b4e22d2e73725 100644
--- a/testsuite/generate-format/src/move_abi.rs
+++ b/testsuite/generate-format/src/move_abi.rs
@@ -1,8 +1,8 @@
 // Copyright (c) The Diem Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::language_storage;
 use aptos_types::transaction;
-use move_core_types::language_storage;
 use serde_reflection::{Registry, Result, Samples, Tracer, TracerConfig};
 
 /// Default output file.
diff --git a/testsuite/generate-format/tests/staged/aptos.yaml b/testsuite/generate-format/tests/staged/aptos.yaml
index 62d2a1928bb17..cc903f198ab94 100644
--- a/testsuite/generate-format/tests/staged/aptos.yaml
+++ b/testsuite/generate-format/tests/staged/aptos.yaml
@@ -222,7 +222,7 @@ TransactionPayload:
 TypeTag:
   ENUM:
     0:
-      Bool: UNIT
+      bool: UNIT
     1:
       U8: UNIT
     2:
diff --git a/testsuite/generate-format/tests/staged/consensus.yaml b/testsuite/generate-format/tests/staged/consensus.yaml
index 46ae3da7878ff..4ae8f0c71dc88 100644
--- a/testsuite/generate-format/tests/staged/consensus.yaml
+++ b/testsuite/generate-format/tests/staged/consensus.yaml
@@ -437,7 +437,7 @@ TwoChainTimeoutCertificate:
 TypeTag:
   ENUM:
     0:
-      Bool: UNIT
+      bool: UNIT
     1:
       U8: UNIT
     2:
diff --git a/testsuite/generate-format/tests/staged/move_abi.yaml b/testsuite/generate-format/tests/staged/move_abi.yaml
index 7f54a0725f6c0..8d989a7260a30 100644
--- a/testsuite/generate-format/tests/staged/move_abi.yaml
+++ b/testsuite/generate-format/tests/staged/move_abi.yaml
@@ -67,7 +67,7 @@ TypeArgumentABI:
 TypeTag:
   ENUM:
     0:
-      Bool: UNIT
+      bool: UNIT
     1:
       U8: UNIT
     2:
diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml
index bad0a333c1648..0cc5270a559f5 100644
--- a/testsuite/smoke-test/Cargo.toml
+++ b/testsuite/smoke-test/Cargo.toml
@@ -31,17 +31,18 @@ aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
 aptos-types = { path = "../../types" }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
 forge = { path = "../forge" }
-move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-ir-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-stdlib = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-move-package = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-command-line-common = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-ir-compiler = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-stdlib = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+move-package = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
+
 
 [dev-dependencies]
 base64 = "0.13.0"
 hex = "0.4.3"
 once_cell = "1.7.2"
 rand = "0.8.3"
-regex = "1.4.3"
+regex = "1.5.5"
 serde_yaml = "0.8.17"
 futures = "0.3.12"
 
diff --git a/types/Cargo.toml b/types/Cargo.toml
index bccc1899a9066..4d60bf5603626 100644
--- a/types/Cargo.toml
+++ b/types/Cargo.toml
@@ -30,8 +30,8 @@ tiny-keccak = { version = "2.0.2", default-features = false, features = ["sha3"]
 bcs = "0.1.2"
 aptos-crypto = { path = "../crates/aptos-crypto", version = "0.0.3" }
 aptos-crypto-derive = { path = "../crates/aptos-crypto-derive", version = "0.0.3" }
-move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", version = "0.0.3" }
-move-read-write-set-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3", version = "0.0.3" }
+move-read-write-set-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" }
 
 [dev-dependencies]
@@ -41,7 +41,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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", features = ["fuzzing"]  }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3", features = ["fuzzing"]  }
 
 [features]
 default = []
diff --git a/vm-validator/Cargo.toml b/vm-validator/Cargo.toml
index aa8d0a47edee4..58c32b82fb119 100644
--- a/vm-validator/Cargo.toml
+++ b/vm-validator/Cargo.toml
@@ -31,7 +31,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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
+move-core-types = { git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" }
 
 [features]
 default = []
diff --git a/x.toml b/x.toml
index 5b5de2336e8f1..8659ea65e25c8 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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" },
-    { name = "move-core-types", git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" },
-    { name = "move-stdlib", git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" },
-    { name = "move-vm-runtime", git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" },
-    { name = "move-vm-types", git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" },
+    { name = "move-binary-format", git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" },
+    { name = "move-core-types", git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" },
+    { name = "move-stdlib", git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" },
+    { name = "move-vm-runtime", git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" },
+    { name = "move-vm-types", git = "https://github.com/diem/move", rev = "8a260b82dda8175a98ea848fab5adcce467585b3" },
 ]
 
 # This follows the same syntax as CargoOptionsSummary in guppy.