From 6eb50450ecbc886eef99ffd113e5cb85adfae04b Mon Sep 17 00:00:00 2001
From: Jack May <jack@solana.com>
Date: Fri, 1 May 2020 12:51:29 -0700
Subject: [PATCH] Reenable move (#9841)

automerge
---
 Cargo.lock                      | 1398 ++++++++++++++++++++++++++++++-
 bench-tps/Cargo.toml            |    8 +-
 ci/test-stable.sh               |    2 +-
 programs/librapay/Cargo.lock    |  343 ++++----
 programs/librapay/Cargo.toml    |    2 +-
 programs/move_loader/Cargo.lock |  191 +++--
 programs/move_loader/Cargo.toml |   22 +-
 7 files changed, 1693 insertions(+), 273 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 46ed807b3..38f5f9031 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -67,6 +67,15 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ae7d751998c189c1d4468cf0a39bb2eae052a9c58d50ebb3b9591ee3813ad50"
 
+[[package]]
+name = "ascii-canvas"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff8eb72df928aafb99fe5d37b383f2fe25bd2a765e3e5f7c365916b6f2463a29"
+dependencies = [
+ "term 0.5.2",
+]
+
 [[package]]
 name = "assert_cmd"
 version = "1.0.1"
@@ -169,6 +178,12 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3"
 
+[[package]]
+name = "bech32"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58946044516aa9dc922182e0d6e9d124a31aafe6b421614654eb27cf90cec09c"
+
 [[package]]
 name = "bincode"
 version = "1.2.1"
@@ -200,7 +215,16 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "which",
+ "which 3.1.1",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80"
+dependencies = [
+ "bit-vec 0.5.1",
 ]
 
 [[package]]
@@ -215,12 +239,30 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb"
 
+[[package]]
+name = "bit-vec"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4523a10839ffae575fb08aa3423026c8cb4687eef43952afb956229d4f246f7"
+
 [[package]]
 name = "bitflags"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
+[[package]]
+name = "blake2"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
+dependencies = [
+ "byte-tools 0.3.1",
+ "crypto-mac",
+ "digest 0.8.1",
+ "opaque-debug",
+]
+
 [[package]]
 name = "blake2b_simd"
 version = "0.5.10"
@@ -272,6 +314,12 @@ dependencies = [
  "bit-vec 0.4.4",
 ]
 
+[[package]]
+name = "bs58"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c95ee6bba9d950218b6cc910cf62bc9e0a171d0f4537e3627b0f54d08549b188"
+
 [[package]]
 name = "bs58"
 version = "0.3.1"
@@ -295,7 +343,7 @@ name = "btc_spv_bin"
 version = "1.2.0"
 dependencies = [
  "clap",
- "hex",
+ "hex 0.4.2",
  "reqwest",
  "serde",
  "serde_derive",
@@ -384,6 +432,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "c_linked_list"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b"
+
 [[package]]
 name = "cast"
 version = "0.2.3"
@@ -435,6 +489,16 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
+[[package]]
+name = "chashmap"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff41a3c2c1e39921b9003de14bf0439c7b63a9039637c291e1a64925d8ddfa45"
+dependencies = [
+ "owning_ref",
+ "parking_lot 0.4.8",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.11"
@@ -467,7 +531,7 @@ dependencies = [
  "ansi_term",
  "atty",
  "bitflags",
- "strsim",
+ "strsim 0.8.0",
  "textwrap",
  "unicode-width",
  "vec_map",
@@ -503,6 +567,26 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "codespan"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "004def512a9848b23a68ed110927d102b0e6d9f3dc732e28570879afde051f8c"
+dependencies = [
+ "failure",
+ "itertools 0.8.2",
+]
+
+[[package]]
+name = "codespan-reporting"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab081a14ab8f9598ce826890fe896d0addee68c7a58ab49008369ccbb51510a8"
+dependencies = [
+ "codespan",
+ "termcolor",
+]
+
 [[package]]
 name = "colored"
 version = "1.9.3"
@@ -614,6 +698,20 @@ dependencies = [
  "thread-scoped",
 ]
 
+[[package]]
+name = "crossbeam"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e"
+dependencies = [
+ "cfg-if",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.4.2"
@@ -671,6 +769,12 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
 [[package]]
 name = "crypto-mac"
 version = "0.7.0"
@@ -722,6 +826,19 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "curve25519-dalek"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b7dcd30ba50cdf88b55b033456138b7c0ac4afdc436d82e1b79f370f24cc66d"
+dependencies = [
+ "byteorder",
+ "clear_on_drop",
+ "digest 0.8.1",
+ "rand_core 0.3.1",
+ "subtle 2.2.2",
+]
+
 [[package]]
 name = "curve25519-dalek"
 version = "2.0.0"
@@ -735,6 +852,23 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "data-encoding"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11c0346158a19b3627234e15596f5e465c360fcdb97d817bcb255e0510f5a788"
+
+[[package]]
+name = "derivative"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f"
+dependencies = [
+ "proc-macro2 1.0.10",
+ "quote 1.0.1",
+ "syn 1.0.18",
+]
+
 [[package]]
 name = "dialoguer"
 version = "0.5.1"
@@ -746,6 +880,12 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "diff"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
+
 [[package]]
 name = "difference"
 version = "2.0.0"
@@ -779,6 +919,17 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "dirs"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "dirs"
 version = "2.0.2"
@@ -830,6 +981,18 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
+[[package]]
+name = "docopt"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969"
+dependencies = [
+ "lazy_static",
+ "regex",
+ "serde",
+ "strsim 0.9.3",
+]
+
 [[package]]
 name = "dtoa"
 version = "0.4.5"
@@ -843,7 +1006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978710b352437433c97b2bff193f2fb1dfd58a093f863dd95e225a19baa599a2"
 dependencies = [
  "clear_on_drop",
- "curve25519-dalek",
+ "curve25519-dalek 2.0.0",
  "rand 0.7.3",
  "serde",
  "sha2 0.8.1",
@@ -882,6 +1045,15 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "ena"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8944dc8fa28ce4a38f778bd46bf7d923fe73eed5a439398507246c8e017e6f36"
+dependencies = [
+ "log 0.4.8",
+]
+
 [[package]]
 name = "encode_unicode"
 version = "0.3.6"
@@ -897,6 +1069,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
 [[package]]
 name = "enum-primitive-derive"
 version = "0.1.2"
@@ -934,6 +1112,27 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "errno"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b480f641ccf0faf324e20c1d3e53d81b7484c698b42ea677f6907ae4db195371"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi 0.3.8",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067"
+dependencies = [
+ "gcc",
+ "libc",
+]
+
 [[package]]
 name = "failure"
 version = "0.1.7"
@@ -989,6 +1188,12 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "fixedbitset"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
+
 [[package]]
 name = "flate2"
 version = "1.0.14"
@@ -1128,6 +1333,12 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "gcc"
+version = "0.3.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
+
 [[package]]
 name = "generic-array"
 version = "0.9.0"
@@ -1156,6 +1367,28 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "get_if_addrs"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abddb55a898d32925f3148bd281174a68eeb68bbfd9a5938a57b18f506ee4ef7"
+dependencies = [
+ "c_linked_list",
+ "get_if_addrs-sys",
+ "libc",
+ "winapi 0.2.8",
+]
+
+[[package]]
+name = "get_if_addrs-sys"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d04f9fb746cf36b191c00f3ede8bde9c8e64f9f4b05ae2694a9ccf5e3f5ab48"
+dependencies = [
+ "gcc",
+ "libc",
+]
+
 [[package]]
 name = "gethostname"
 version = "0.2.1"
@@ -1248,6 +1481,15 @@ dependencies = [
  "byteorder",
 ]
 
+[[package]]
+name = "heck"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.12"
@@ -1257,6 +1499,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hex"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
+
 [[package]]
 name = "hex"
 version = "0.4.2"
@@ -1282,6 +1530,12 @@ dependencies = [
  "proc-macro-hack",
 ]
 
+[[package]]
+name = "hex_fmt"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f"
+
 [[package]]
 name = "hidapi"
 version = "1.2.1"
@@ -1547,6 +1801,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.9.0"
@@ -1721,6 +1984,12 @@ dependencies = [
  "ws",
 ]
 
+[[package]]
+name = "keccak"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1731,6 +2000,37 @@ dependencies = [
  "winapi-build",
 ]
 
+[[package]]
+name = "lalrpop"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64dc3698e75d452867d9bd86f4a723f452ce9d01fe1d55990b79f0c790aa67db"
+dependencies = [
+ "ascii-canvas",
+ "atty",
+ "bit-set",
+ "diff",
+ "docopt",
+ "ena",
+ "itertools 0.8.2",
+ "lalrpop-util",
+ "petgraph",
+ "regex",
+ "regex-syntax",
+ "serde",
+ "serde_derive",
+ "sha2 0.8.1",
+ "string_cache",
+ "term 0.5.2",
+ "unicode-xid 0.1.0",
+]
+
+[[package]]
+name = "lalrpop-util"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c277d18683b36349ab5cd030158b54856fca6bb2d5dc5263b06288f486958b7c"
+
 [[package]]
 name = "language-tags"
 version = "0.2.2"
@@ -1822,6 +2122,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "mach_o_sys"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e854583a83f20cf329bb9283366335387f7db59d640d1412167e05fedb98826"
+
 [[package]]
 name = "matches"
 version = "0.1.8"
@@ -1868,6 +2174,18 @@ dependencies = [
  "autocfg 1.0.0",
 ]
 
+[[package]]
+name = "memsec"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cb9280f8c37546661083aa45eb0318d8469253d31e87649faed25522428398e"
+dependencies = [
+ "getrandom",
+ "libc",
+ "mach_o_sys",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "mime"
 version = "0.2.6"
@@ -1956,6 +2274,18 @@ dependencies = [
  "ws2_32-sys",
 ]
 
+[[package]]
+name = "mirai-annotations"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a76c45e77b9af9f0a3fd33cfd462210c1c221029343ac5346306f28b86943ebd"
+
+[[package]]
+name = "multimap"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04b9f127583ed176e163fb9ec6f3e793b87e21deedd5734a69386a18a0151"
+
 [[package]]
 name = "native-tls"
 version = "0.2.4"
@@ -1985,6 +2315,18 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+
+[[package]]
+name = "nibble_vec"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8d77f3db4bce033f4d04db08079b2ef1c3d02b44e86f25d08886fafa7756ffa"
+
 [[package]]
 name = "nix"
 version = "0.17.0"
@@ -2077,6 +2419,28 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
+dependencies = [
+ "derivative",
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2 1.0.10",
+ "quote 1.0.1",
+ "syn 1.0.18",
+]
+
 [[package]]
 name = "number_prefix"
 version = "0.3.0"
@@ -2131,6 +2495,74 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "ordermap"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063"
+
+[[package]]
+name = "owning_ref"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
+dependencies = [
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "pairing"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ceda21136251c6d5a422d3d798d8ac22515a6e8d3521bb60c59a8349d36d0d57"
+dependencies = [
+ "byteorder",
+ "rand 0.4.6",
+]
+
+[[package]]
+name = "parity-multiaddr"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "045b3c7af871285146300da35b1932bb6e4639b66c7c98e85d06a32cbc4e8fa7"
+dependencies = [
+ "arrayref",
+ "bs58 0.2.5",
+ "byteorder",
+ "bytes 0.4.12",
+ "data-encoding",
+ "parity-multihash",
+ "percent-encoding 1.0.1",
+ "serde",
+ "unsigned-varint",
+ "url 1.7.2",
+]
+
+[[package]]
+name = "parity-multihash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3a17dc27848fd99e4f87eb0f8c9baba6ede0a6d555400c850ca45254ef4ce3"
+dependencies = [
+ "blake2",
+ "bytes 0.4.12",
+ "rand 0.6.5",
+ "sha-1",
+ "sha2 0.8.1",
+ "sha3",
+ "unsigned-varint",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e"
+dependencies = [
+ "owning_ref",
+ "parking_lot_core 0.2.14",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.9.0"
@@ -2152,6 +2584,18 @@ dependencies = [
  "parking_lot_core 0.7.2",
 ]
 
+[[package]]
+name = "parking_lot_core"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
+dependencies = [
+ "libc",
+ "rand 0.4.6",
+ "smallvec 0.6.13",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "parking_lot_core"
 version = "0.6.2"
@@ -2231,6 +2675,35 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
+[[package]]
+name = "petgraph"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f"
+dependencies = [
+ "fixedbitset",
+ "ordermap",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
+dependencies = [
+ "phf_shared",
+ "rand 0.6.5",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "pin-project"
 version = "0.4.9"
@@ -2275,6 +2748,12 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
 [[package]]
 name = "predicates"
 version = "1.0.4"
@@ -2328,6 +2807,32 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "proc-macro-error"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2 1.0.10",
+ "quote 1.0.1",
+ "syn 1.0.18",
+ "version_check 0.9.1",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53"
+dependencies = [
+ "proc-macro2 1.0.10",
+ "quote 1.0.1",
+ "syn 1.0.18",
+ "syn-mid",
+ "version_check 0.9.1",
+]
+
 [[package]]
 name = "proc-macro-hack"
 version = "0.5.15"
@@ -2358,6 +2863,102 @@ dependencies = [
  "unicode-xid 0.2.0",
 ]
 
+[[package]]
+name = "prometheus"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5567486d5778e2c6455b1b90ff1c558f29e751fc018130fa182e15828e728af1"
+dependencies = [
+ "cfg-if",
+ "fnv",
+ "lazy_static",
+ "quick-error",
+ "spin",
+]
+
+[[package]]
+name = "proptest"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01c477819b845fe023d33583ebf10c9f62518c8d79a0960ba5c36d6ac8a55a5b"
+dependencies = [
+ "bit-set",
+ "bitflags",
+ "byteorder",
+ "lazy_static",
+ "num-traits 0.2.11",
+ "quick-error",
+ "rand 0.6.5",
+ "rand_chacha 0.1.1",
+ "rand_xorshift",
+ "regex-syntax",
+ "rusty-fork",
+ "tempfile",
+]
+
+[[package]]
+name = "proptest-derive"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d31edb17edac73aeacc947bd61462dda15220584268896a58e12f053d767f15b"
+dependencies = [
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.44",
+]
+
+[[package]]
+name = "prost"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d14b1c185652833d24aaad41c5832b0be5616a590227c1fbff57c616754b23"
+dependencies = [
+ "byteorder",
+ "bytes 0.4.12",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb788126ea840817128183f8f603dce02cb7aea25c2a0b764359d8e20010702e"
+dependencies = [
+ "bytes 0.4.12",
+ "heck",
+ "itertools 0.8.2",
+ "log 0.4.8",
+ "multimap",
+ "petgraph",
+ "prost",
+ "prost-types",
+ "tempfile",
+ "which 2.0.1",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e7dc378b94ac374644181a2247cebf59a6ec1c88b49ac77f3a94b86b79d0e11"
+dependencies = [
+ "failure",
+ "itertools 0.8.2",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.44",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1de482a366941c8d56d19b650fac09ca08508f2a696119ee7513ad590c8bac6f"
+dependencies = [
+ "bytes 0.4.12",
+ "prost",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -2388,6 +2989,16 @@ dependencies = [
  "proc-macro2 1.0.10",
 ]
 
+[[package]]
+name = "radix_trie"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3681b28cd95acfb0560ea9441f82d6a4504fa3b15b97bd7b6e952131820e95"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
 [[package]]
 name = "rand"
 version = "0.4.6"
@@ -2415,7 +3026,7 @@ dependencies = [
  "rand_isaac",
  "rand_jitter",
  "rand_os",
- "rand_pcg",
+ "rand_pcg 0.1.2",
  "rand_xorshift",
  "winapi 0.3.8",
 ]
@@ -2431,6 +3042,26 @@ dependencies = [
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
+ "rand_pcg 0.2.1",
+]
+
+[[package]]
+name = "rand04"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58595cc8bb12add45412667f9b422d5a9842d61d36e8607bc7c84ff738bf9263"
+dependencies = [
+ "rand 0.4.6",
+]
+
+[[package]]
+name = "rand04_compat"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e4cc0eb4bbb0cbc6c2a8081aa11303b9520369eea474cf865f7b7e3f11b284b"
+dependencies = [
+ "rand 0.6.5",
+ "rand04",
 ]
 
 [[package]]
@@ -2539,6 +3170,15 @@ dependencies = [
  "rand_core 0.4.2",
 ]
 
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
 [[package]]
 name = "rand_xorshift"
 version = "0.1.1"
@@ -2645,6 +3285,27 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "rental"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8545debe98b2b139fb04cad8618b530e9b07c152d99a5de83c860b877d67847f"
+dependencies = [
+ "rental-impl",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "rental-impl"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de"
+dependencies = [
+ "proc-macro2 1.0.10",
+ "quote 1.0.1",
+ "syn 1.0.18",
+]
+
 [[package]]
 name = "reqwest"
 version = "0.10.4"
@@ -2775,6 +3436,18 @@ dependencies = [
  "security-framework",
 ]
 
+[[package]]
+name = "rusty-fork"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dd93264e10c577503e926bd1430193eeb5d21b059148910082245309b424fae"
+dependencies = [
+ "fnv",
+ "quick-error",
+ "tempfile",
+ "wait-timeout",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.4"
@@ -2988,6 +3661,19 @@ dependencies = [
  "opaque-debug",
 ]
 
+[[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 0.3.1",
+ "digest 0.8.1",
+ "keccak",
+ "opaque-debug",
+]
+
 [[package]]
 name = "shlex"
 version = "0.1.1"
@@ -3014,12 +3700,87 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
+
 [[package]]
 name = "slab"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
+[[package]]
+name = "slog"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cc9c640a4adbfbcc11ffb95efe5aa7af7309e002adab54b185507dbf2377b99"
+
+[[package]]
+name = "slog-async"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51b3336ce47ce2f96673499fc07eb85e3472727b9a7a2959964b002c2ce8fbbb"
+dependencies = [
+ "crossbeam-channel",
+ "slog",
+ "take_mut",
+ "thread_local",
+]
+
+[[package]]
+name = "slog-envlogger"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "906a1a0bc43fed692df4b82a5e2fbfc3733db8dad8bb514ab27a4f23ad04f5c0"
+dependencies = [
+ "log 0.4.8",
+ "regex",
+ "slog",
+ "slog-async",
+ "slog-scope",
+ "slog-stdlog",
+ "slog-term",
+]
+
+[[package]]
+name = "slog-scope"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c44c89dd8b0ae4537d1ae318353eaf7840b4869c536e31c41e963d1ea523ee6"
+dependencies = [
+ "arc-swap",
+ "lazy_static",
+ "slog",
+]
+
+[[package]]
+name = "slog-stdlog"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d87903baf655da2d82bc3ac3f7ef43868c58bf712b3a661fda72009304c23"
+dependencies = [
+ "crossbeam",
+ "log 0.4.8",
+ "slog",
+ "slog-scope",
+]
+
+[[package]]
+name = "slog-term"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "124501187c410b6a46fe8a47a48435ae462fae4e02d03c558d358f40b17308cb"
+dependencies = [
+ "atty",
+ "chrono",
+ "slog",
+ "term 0.6.1",
+ "thread_local",
+]
+
 [[package]]
 name = "smallvec"
 version = "0.6.13"
@@ -3084,7 +3845,7 @@ dependencies = [
  "bincode",
  "crossbeam-channel",
  "ed25519-dalek",
- "hex",
+ "hex 0.4.2",
  "log 0.4.8",
  "rand 0.7.3",
  "rand_chacha 0.2.2",
@@ -3111,7 +3872,7 @@ dependencies = [
 name = "solana-archiver-utils"
 version = "1.2.0"
 dependencies = [
- "hex",
+ "hex 0.4.2",
  "log 0.4.8",
  "rand 0.7.3",
  "solana-chacha",
@@ -3195,10 +3956,12 @@ dependencies = [
  "solana-core",
  "solana-faucet",
  "solana-genesis",
+ "solana-librapay",
  "solana-local-cluster",
  "solana-logger",
  "solana-measure",
  "solana-metrics",
+ "solana-move-loader-program",
  "solana-net-utils",
  "solana-runtime",
  "solana-sdk",
@@ -3226,7 +3989,7 @@ name = "solana-btc-spv-program"
 version = "1.2.0"
 dependencies = [
  "bincode",
- "hex",
+ "hex 0.4.2",
  "log 0.4.8",
  "num-derive 0.3.0",
  "num-traits 0.2.11",
@@ -3307,13 +4070,13 @@ version = "1.2.0"
 dependencies = [
  "Inflector",
  "bincode",
- "bs58",
+ "bs58 0.3.1",
  "chrono",
  "clap",
  "console 0.10.3",
  "criterion-stats",
  "ctrlc",
- "dirs",
+ "dirs 2.0.2",
  "humantime 2.0.0",
  "indicatif",
  "log 0.4.8",
@@ -3349,7 +4112,7 @@ dependencies = [
 name = "solana-cli-config"
 version = "1.2.0"
 dependencies = [
- "dirs",
+ "dirs 2.0.2",
  "lazy_static",
  "serde",
  "serde_derive",
@@ -3363,7 +4126,7 @@ version = "1.2.0"
 dependencies = [
  "assert_matches",
  "bincode",
- "bs58",
+ "bs58 0.3.1",
  "indicatif",
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -3401,7 +4164,7 @@ name = "solana-core"
 version = "1.2.0"
 dependencies = [
  "bincode",
- "bs58",
+ "bs58 0.3.1",
  "bv",
  "byteorder",
  "chrono",
@@ -3472,7 +4235,7 @@ dependencies = [
  "backtrace",
  "bytes 0.4.12",
  "cc",
- "curve25519-dalek",
+ "curve25519-dalek 2.0.0",
  "ed25519-dalek",
  "either",
  "failure",
@@ -3622,7 +4385,7 @@ dependencies = [
  "clap",
  "console 0.10.3",
  "ctrlc",
- "dirs",
+ "dirs 2.0.2",
  "indicatif",
  "lazy_static",
  "nix",
@@ -3647,9 +4410,9 @@ dependencies = [
 name = "solana-keygen"
 version = "1.2.0"
 dependencies = [
- "bs58",
+ "bs58 0.3.1",
  "clap",
- "dirs",
+ "dirs 2.0.2",
  "num_cpus",
  "solana-clap-utils",
  "solana-cli-config",
@@ -3712,7 +4475,7 @@ name = "solana-ledger-tool"
 version = "1.2.0"
 dependencies = [
  "assert_cmd",
- "bs58",
+ "bs58 0.3.1",
  "clap",
  "histogram",
  "serde_json",
@@ -3729,6 +4492,19 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "solana-librapay"
+version = "1.2.0"
+dependencies = [
+ "bincode",
+ "log 0.4.8",
+ "solana-logger",
+ "solana-move-loader-program",
+ "solana-runtime",
+ "solana-sdk",
+ "solana_libra_types",
+]
+
 [[package]]
 name = "solana-local-cluster"
 version = "1.2.0"
@@ -3796,7 +4572,7 @@ name = "solana-merkle-tree"
 version = "1.2.0"
 dependencies = [
  "fast-math",
- "hex",
+ "hex 0.4.2",
  "solana-sdk",
 ]
 
@@ -3815,6 +4591,35 @@ dependencies = [
  "solana-sdk",
 ]
 
+[[package]]
+name = "solana-move-loader-program"
+version = "1.2.0"
+dependencies = [
+ "bincode",
+ "indexmap",
+ "log 0.4.8",
+ "num-derive 0.3.0",
+ "num-traits 0.2.11",
+ "serde",
+ "serde_bytes",
+ "serde_derive",
+ "serde_json",
+ "solana-logger",
+ "solana-sdk",
+ "solana_libra_bytecode_verifier",
+ "solana_libra_canonical_serialization",
+ "solana_libra_compiler",
+ "solana_libra_failure_ext",
+ "solana_libra_state_view",
+ "solana_libra_stdlib",
+ "solana_libra_types",
+ "solana_libra_vm",
+ "solana_libra_vm_cache_map",
+ "solana_libra_vm_runtime",
+ "solana_libra_vm_runtime_types",
+ "thiserror",
+]
+
 [[package]]
 name = "solana-net-shaper"
 version = "1.2.0"
@@ -3983,13 +4788,13 @@ version = "1.2.0"
 dependencies = [
  "assert_matches",
  "bincode",
- "bs58",
+ "bs58 0.3.1",
  "bv",
  "byteorder",
  "chrono",
  "ed25519-dalek",
  "generic-array 0.14.1",
- "hex",
+ "hex 0.4.2",
  "hmac",
  "itertools 0.9.0",
  "log 0.4.8",
@@ -4016,7 +4821,7 @@ name = "solana-sdk-c"
 version = "1.2.0"
 dependencies = [
  "bincode",
- "bs58",
+ "bs58 0.3.1",
  "cbindgen",
  "ed25519-dalek",
  "libc",
@@ -4029,7 +4834,7 @@ dependencies = [
 name = "solana-sdk-macro"
 version = "1.2.0"
 dependencies = [
- "bs58",
+ "bs58 0.3.1",
  "proc-macro2 1.0.10",
  "quote 1.0.1",
  "syn 1.0.18",
@@ -4142,7 +4947,7 @@ name = "solana-transaction-status"
 version = "1.2.0"
 dependencies = [
  "bincode",
- "bs58",
+ "bs58 0.3.1",
  "serde",
  "serde_derive",
  "solana-sdk",
@@ -4247,6 +5052,349 @@ dependencies = [
  "solana-sdk",
 ]
 
+[[package]]
+name = "solana_libra_bytecode_verifier"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd72dfd0637c9f15ec52ef5739d92594ba38ad0e644720e882b28f85afef1132"
+dependencies = [
+ "mirai-annotations",
+ "petgraph",
+ "solana_libra_failure_ext",
+ "solana_libra_types",
+ "solana_libra_vm",
+ "solana_libra_vm_runtime_types",
+]
+
+[[package]]
+name = "solana_libra_canonical_serialization"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fe30d99c623682886f986147887f7b5b14f6ac290da5801163beb22f42ad1f"
+dependencies = [
+ "byteorder",
+ "solana_libra_failure_ext",
+]
+
+[[package]]
+name = "solana_libra_compiler"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72384762bc7e859c7ac8a45dbf3e29b2913467a45d3e015982ec676e72181c22"
+dependencies = [
+ "serde_json",
+ "solana_libra_bytecode_verifier",
+ "solana_libra_failure_ext",
+ "solana_libra_ir_to_bytecode",
+ "solana_libra_stdlib",
+ "solana_libra_types",
+ "solana_libra_vm",
+ "structopt",
+]
+
+[[package]]
+name = "solana_libra_config"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0f419b7ea9bc1689c774c695ede05b4c285030a948b09fad0fadb7b0631600e"
+dependencies = [
+ "get_if_addrs",
+ "hex 0.3.2",
+ "mirai-annotations",
+ "parity-multiaddr",
+ "prost",
+ "rand 0.7.3",
+ "serde",
+ "solana_libra_crypto",
+ "solana_libra_failure_ext",
+ "solana_libra_logger",
+ "solana_libra_tools",
+ "solana_libra_types",
+ "toml",
+]
+
+[[package]]
+name = "solana_libra_crypto"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf6484e75e14d60d018408fe1f6b7a7b3b46814638935b145f1a3cb16eb3ec9"
+dependencies = [
+ "bincode",
+ "byteorder",
+ "bytes 0.4.12",
+ "curve25519-dalek 1.2.3",
+ "digest 0.8.1",
+ "ed25519-dalek",
+ "hex 0.3.2",
+ "hmac",
+ "lazy_static",
+ "pairing",
+ "proptest",
+ "proptest-derive",
+ "rand 0.7.3",
+ "serde",
+ "sha2 0.8.1",
+ "sha3",
+ "solana_libra_canonical_serialization",
+ "solana_libra_crypto-derive",
+ "solana_libra_failure_ext",
+ "solana_libra_nibble",
+ "threshold_crypto",
+ "tiny-keccak",
+ "x25519-dalek",
+]
+
+[[package]]
+name = "solana_libra_crypto-derive"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67801085b6adee0d30caa77d126bbceafa4b9bb8f4c7871e29638faa20dcd8b1"
+dependencies = [
+ "proc-macro2 1.0.10",
+ "quote 1.0.1",
+ "syn 1.0.18",
+]
+
+[[package]]
+name = "solana_libra_failure_ext"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "855b1630e51456c58cb73ff6182b61a40c500dcaf5512ccf359a461225b58511"
+dependencies = [
+ "failure",
+ "solana_libra_failure_macros",
+]
+
+[[package]]
+name = "solana_libra_failure_macros"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bf1d38966c68be541232f166205f352f16defd665f50d6db1f1736872d716af"
+
+[[package]]
+name = "solana_libra_ir_to_bytecode"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8b20477a89c89fc10b18b5f6d01f2c8d58c363e49a6b8db208152825622c051"
+dependencies = [
+ "codespan",
+ "codespan-reporting",
+ "lalrpop-util",
+ "log 0.4.8",
+ "solana_libra_failure_ext",
+ "solana_libra_ir_to_bytecode_syntax",
+ "solana_libra_types",
+ "solana_libra_vm",
+]
+
+[[package]]
+name = "solana_libra_ir_to_bytecode_syntax"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99492e984c4f283b561385d5bb15a63bdf55e8f741477e00f8e57b8934749bd0"
+dependencies = [
+ "codespan",
+ "hex 0.3.2",
+ "lalrpop",
+ "lalrpop-util",
+ "lazy_static",
+ "regex",
+ "solana_libra_failure_ext",
+ "solana_libra_types",
+]
+
+[[package]]
+name = "solana_libra_logger"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62fb1d124421fda39a5d872c8b5add50ce7cf43a88505e0aea702a575127a3c8"
+dependencies = [
+ "backtrace",
+ "chrono",
+ "itertools 0.8.2",
+ "lazy_static",
+ "rand 0.7.3",
+ "rand_core 0.5.1",
+ "serde",
+ "serde_json",
+ "slog",
+ "slog-async",
+ "slog-envlogger",
+ "slog-scope",
+ "slog-term",
+ "thread-id",
+]
+
+[[package]]
+name = "solana_libra_metrics"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94edebdee2305eabf8ccd7571eecaaa4328d4aba493c3a3e988db67230a8a8c4"
+dependencies = [
+ "futures",
+ "hyper 0.12.35",
+ "lazy_static",
+ "prometheus",
+ "serde_json",
+ "solana_libra_failure_ext",
+ "solana_libra_logger",
+]
+
+[[package]]
+name = "solana_libra_nibble"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8f40b8a06a508a618a23be932d07c2dc0a87a152f98dafc451d1bedb3a9c0c8"
+dependencies = [
+ "proptest",
+ "serde",
+]
+
+[[package]]
+name = "solana_libra_proptest_helpers"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e098b96303a5fc002a12f67692fd9271372d86fd0a82774153933324125567e2"
+dependencies = [
+ "crossbeam",
+ "proptest",
+ "proptest-derive",
+]
+
+[[package]]
+name = "solana_libra_state_view"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cd9ace92273edf4f681d6a9dcb93ed8f444e0a4db45efc3ffd26ff35eea4051"
+dependencies = [
+ "solana_libra_failure_ext",
+ "solana_libra_types",
+]
+
+[[package]]
+name = "solana_libra_stdlib"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c56b6211942fba07b187288fa22ff6bce829337c3982427431501edab017bfd4"
+dependencies = [
+ "lazy_static",
+ "solana_libra_bytecode_verifier",
+ "solana_libra_ir_to_bytecode",
+ "solana_libra_types",
+]
+
+[[package]]
+name = "solana_libra_tools"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3415a2dd54cfe45a58639cac065c285a86bf31364e4a944d6ff9ff37b87a05e"
+dependencies = [
+ "hex 0.3.2",
+ "rand 0.7.3",
+]
+
+[[package]]
+name = "solana_libra_types"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4524f25618443c6e1081bd141d9cf76fb76471c8da8dcd8c6e5057a0cd331b7"
+dependencies = [
+ "bech32",
+ "byteorder",
+ "bytes 0.4.12",
+ "chrono",
+ "hex 0.3.2",
+ "itertools 0.8.2",
+ "lazy_static",
+ "num_enum",
+ "proptest",
+ "proptest-derive",
+ "prost",
+ "prost-build",
+ "radix_trie",
+ "rand 0.7.3",
+ "serde",
+ "solana_libra_canonical_serialization",
+ "solana_libra_crypto",
+ "solana_libra_failure_ext",
+ "solana_libra_logger",
+ "solana_libra_proptest_helpers",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "solana_libra_vm"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f970fd967e20709b9fa131a0764a91128fe8583859bc23cdf82b7a3e98ef3cd"
+dependencies = [
+ "byteorder",
+ "hex 0.3.2",
+ "lazy_static",
+ "mirai-annotations",
+ "proptest",
+ "proptest-derive",
+ "serde",
+ "solana_libra_canonical_serialization",
+ "solana_libra_crypto",
+ "solana_libra_failure_ext",
+ "solana_libra_proptest_helpers",
+ "solana_libra_types",
+]
+
+[[package]]
+name = "solana_libra_vm_cache_map"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "332cdd6a4c4c1d72aee9fb495d190c7338cdaf38179a2d624b51e0e25bdc852d"
+dependencies = [
+ "chashmap",
+ "typed-arena",
+]
+
+[[package]]
+name = "solana_libra_vm_runtime"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "804a1a7ce9fa28f3281a5cbb1d2747917d1a4d80f954243592da77389539a9ef"
+dependencies = [
+ "hex 0.3.2",
+ "lazy_static",
+ "mirai-annotations",
+ "prometheus",
+ "proptest",
+ "rayon",
+ "rental",
+ "solana_libra_bytecode_verifier",
+ "solana_libra_canonical_serialization",
+ "solana_libra_config",
+ "solana_libra_crypto",
+ "solana_libra_logger",
+ "solana_libra_metrics",
+ "solana_libra_state_view",
+ "solana_libra_types",
+ "solana_libra_vm",
+ "solana_libra_vm_cache_map",
+ "solana_libra_vm_runtime_types",
+]
+
+[[package]]
+name = "solana_libra_vm_runtime_types"
+version = "0.0.1-sol5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "790621a290a17a41cec0883decc861b2102b5d4d9f638492bbc55613ea142e85"
+dependencies = [
+ "bit-vec 0.6.1",
+ "lazy_static",
+ "proptest",
+ "sha2 0.8.1",
+ "solana_libra_canonical_serialization",
+ "solana_libra_crypto",
+ "solana_libra_failure_ext",
+ "solana_libra_types",
+ "solana_libra_vm",
+]
+
 [[package]]
 name = "solana_rbpf"
 version = "0.1.26"
@@ -4270,6 +5418,12 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+
 [[package]]
 name = "string"
 version = "0.2.1"
@@ -4279,12 +5433,76 @@ dependencies = [
  "bytes 0.4.12",
 ]
 
+[[package]]
+name = "string_cache"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89c058a82f9fd69b1becf8c274f412281038877c553182f1d02eb027045a2d67"
+dependencies = [
+ "lazy_static",
+ "new_debug_unreachable",
+ "phf_shared",
+ "precomputed-hash",
+ "serde",
+ "string_cache_codegen",
+ "string_cache_shared",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2 1.0.10",
+ "quote 1.0.1",
+ "string_cache_shared",
+]
+
+[[package]]
+name = "string_cache_shared"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
+
 [[package]]
 name = "strsim"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
+[[package]]
+name = "strsim"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
+
+[[package]]
+name = "structopt"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "863246aaf5ddd0d6928dfeb1a9ca65f505599e4e1b399935ef7e75107516b4ef"
+dependencies = [
+ "clap",
+ "lazy_static",
+ "structopt-derive",
+]
+
+[[package]]
+name = "structopt-derive"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d239ca4b13aee7a2142e6795cbd69e457665ff8037aed33b3effdc430d2f927a"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2 1.0.10",
+ "quote 1.0.1",
+ "syn 1.0.18",
+]
+
 [[package]]
 name = "subtle"
 version = "1.0.0"
@@ -4336,6 +5554,17 @@ dependencies = [
  "unicode-xid 0.2.0",
 ]
 
+[[package]]
+name = "syn-mid"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
+dependencies = [
+ "proc-macro2 1.0.10",
+ "quote 1.0.1",
+ "syn 1.0.18",
+]
+
 [[package]]
 name = "synom"
 version = "0.11.3"
@@ -4385,6 +5614,12 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "take_mut"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
+
 [[package]]
 name = "tar"
 version = "0.4.26"
@@ -4421,6 +5656,27 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "term"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
+dependencies = [
+ "byteorder",
+ "dirs 1.0.5",
+ "winapi 0.3.8",
+]
+
+[[package]]
+name = "term"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5"
+dependencies = [
+ "dirs 2.0.2",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.0"
@@ -4478,6 +5734,17 @@ dependencies = [
  "syn 1.0.18",
 ]
 
+[[package]]
+name = "thread-id"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1"
+dependencies = [
+ "libc",
+ "redox_syscall",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "thread-scoped"
 version = "1.0.2"
@@ -4493,6 +5760,26 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "threshold_crypto"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95be1032c63011f20b01c5edb64930e2b51512782b43b458b1e3449613d70f87"
+dependencies = [
+ "byteorder",
+ "errno",
+ "failure",
+ "hex_fmt",
+ "log 0.4.8",
+ "memsec",
+ "pairing",
+ "rand 0.6.5",
+ "rand04_compat",
+ "rand_chacha 0.1.1",
+ "serde",
+ "tiny-keccak",
+]
+
 [[package]]
 name = "time"
 version = "0.1.43"
@@ -4519,6 +5806,15 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[package]]
+name = "tiny-keccak"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2"
+dependencies = [
+ "crunchy",
+]
+
 [[package]]
 name = "tokio"
 version = "0.1.22"
@@ -4835,6 +6131,12 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
 
+[[package]]
+name = "typed-arena"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d"
+
 [[package]]
 name = "typenum"
 version = "1.12.0"
@@ -4877,6 +6179,12 @@ dependencies = [
  "smallvec 1.4.0",
 ]
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+
 [[package]]
 name = "unicode-width"
 version = "0.1.7"
@@ -4910,6 +6218,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "unsigned-varint"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7f0023a96687fe169081e8adce3f65e3874426b7886e9234d490af2dc077959"
+
 [[package]]
 name = "untrusted"
 version = "0.7.1"
@@ -5169,6 +6483,16 @@ dependencies = [
  "tokio-tls",
 ]
 
+[[package]]
+name = "which"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164"
+dependencies = [
+ "failure",
+ "libc",
+]
+
 [[package]]
 name = "which"
 version = "3.1.1"
@@ -5267,6 +6591,17 @@ dependencies = [
  "winapi-build",
 ]
 
+[[package]]
+name = "x25519-dalek"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217"
+dependencies = [
+ "curve25519-dalek 2.0.0",
+ "rand_core 0.5.1",
+ "zeroize",
+]
+
 [[package]]
 name = "xattr"
 version = "0.2.2"
@@ -5290,6 +6625,21 @@ name = "zeroize"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
+dependencies = [
+ "proc-macro2 1.0.10",
+ "quote 1.0.1",
+ "syn 1.0.18",
+ "synstructure",
+]
 
 [[package]]
 name = "zstd"
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
index 780032602..24de11b50 100644
--- a/bench-tps/Cargo.toml
+++ b/bench-tps/Cargo.toml
@@ -19,22 +19,22 @@ solana-core = { path = "../core", version = "1.2.0" }
 solana-genesis = { path = "../genesis", version = "1.2.0" }
 solana-client = { path = "../client", version = "1.2.0" }
 solana-faucet = { path = "../faucet", version = "1.2.0" }
-#solana-librapay = { path = "../programs/librapay", version = "1.2.0", optional = true }
+solana-librapay = { path = "../programs/librapay", version = "1.2.0", optional = true }
 solana-logger = { path = "../logger", version = "1.2.0" }
 solana-metrics = { path = "../metrics", version = "1.2.0" }
 solana-measure = { path = "../measure", version = "1.2.0" }
 solana-net-utils = { path = "../net-utils", version = "1.2.0" }
 solana-runtime = { path = "../runtime", version = "1.2.0" }
 solana-sdk = { path = "../sdk", version = "1.2.0" }
-#solana-move-loader-program = { path = "../programs/move_loader", version = "1.2.0", optional = true }
+solana-move-loader-program = { path = "../programs/move_loader", version = "1.2.0", optional = true }
 
 [dev-dependencies]
 serial_test = "0.4.0"
 serial_test_derive = "0.4.0"
 solana-local-cluster = { path = "../local-cluster", version = "1.2.0" }
 
-#[features]
-#move = ["solana-librapay", "solana-move-loader-program"]
+[features]
+move = ["solana-librapay", "solana-move-loader-program"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/ci/test-stable.sh b/ci/test-stable.sh
index 55e6474d0..b25bd6da4 100755
--- a/ci/test-stable.sh
+++ b/ci/test-stable.sh
@@ -47,7 +47,7 @@ echo "Executing $testName"
 case $testName in
 test-stable)
   _ cargo +"$rust_stable" test --jobs "$NPROC" --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
-  #_ cargo +"$rust_stable" test --manifest-path bench-tps/Cargo.toml --features=move ${V:+--verbose} test_bench_tps_local_cluster_move -- --nocapture
+  _ cargo +"$rust_stable" test --manifest-path bench-tps/Cargo.toml --features=move ${V:+--verbose} test_bench_tps_local_cluster_move -- --nocapture
   ;;
 test-stable-perf)
   ci/affects-files.sh \
diff --git a/programs/librapay/Cargo.lock b/programs/librapay/Cargo.lock
index 8a26aa0be..34a984ce1 100644
--- a/programs/librapay/Cargo.lock
+++ b/programs/librapay/Cargo.lock
@@ -226,14 +226,6 @@ name = "bytes"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "c2-chacha"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "c_linked_list"
 version = "1.1.1"
@@ -468,6 +460,18 @@ dependencies = [
  "subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "curve25519-dalek"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.1.2"
@@ -544,13 +548,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "ed25519-dalek"
-version = "1.0.0-pre.1"
+version = "1.0.0-pre.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1803,9 +1806,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1836,10 +1840,10 @@ dependencies = [
 
 [[package]]
 name = "rand_chacha"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1920,6 +1924,14 @@ dependencies = [
  "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand_xorshift"
 version = "0.1.1"
@@ -2362,13 +2374,13 @@ dependencies = [
  "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ed25519-dalek 1.0.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2388,7 +2400,7 @@ dependencies = [
  "solana-move-loader-program 1.2.0",
  "solana-runtime 1.2.0",
  "solana-sdk 1.2.0",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2438,17 +2450,17 @@ dependencies = [
  "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-logger 1.2.0",
  "solana-sdk 1.2.0",
- "solana_libra_bytecode_verifier 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_canonical_serialization 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_compiler 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_state_view 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_stdlib 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm_cache_map 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm_runtime 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm_runtime_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_bytecode_verifier 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_canonical_serialization 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_compiler 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_state_view 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_stdlib 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_vm 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_vm_cache_map 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_vm_runtime 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_vm_runtime_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
  "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2478,7 +2490,7 @@ dependencies = [
  "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2505,7 +2517,7 @@ dependencies = [
  "bv 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ed25519-dalek 1.0.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "generic-array 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2515,8 +2527,8 @@ dependencies = [
  "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_bytes 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2563,7 +2575,7 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-logger 1.2.0",
@@ -2587,44 +2599,44 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_bytecode_verifier"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "mirai-annotations 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm_runtime_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_vm 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_vm_runtime_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_canonical_serialization"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_compiler"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_bytecode_verifier 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_ir_to_bytecode 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_stdlib 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_bytecode_verifier 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_ir_to_bytecode 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_stdlib 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_vm 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
  "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_config"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "get_if_addrs 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2632,19 +2644,19 @@ dependencies = [
  "mirai-annotations 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-multiaddr 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_crypto 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_logger 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_tools 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_crypto 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_logger 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_tools 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_crypto"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2652,29 +2664,29 @@ dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ed25519-dalek 1.0.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pairing 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proptest-derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_canonical_serialization 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_crypto-derive 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_nibble 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_canonical_serialization 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_crypto-derive 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_nibble 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
  "threshold_crypto 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "x25519-dalek 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "x25519-dalek 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_crypto-derive"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2684,36 +2696,36 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_failure_ext"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_macros 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_macros 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_failure_macros"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "solana_libra_ir_to_bytecode"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "codespan 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "codespan-reporting 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lalrpop-util 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_ir_to_bytecode_syntax 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_ir_to_bytecode_syntax 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_vm 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_ir_to_bytecode_syntax"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "codespan 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2722,20 +2734,21 @@ dependencies = [
  "lalrpop-util 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_logger"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2748,7 +2761,7 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_metrics"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2756,13 +2769,13 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "prometheus 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_logger 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_logger 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_nibble"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2771,7 +2784,7 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_proptest_helpers"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2781,36 +2794,36 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_state_view"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_stdlib"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_bytecode_verifier 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_ir_to_bytecode 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_bytecode_verifier 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_ir_to_bytecode 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_tools"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_types"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bech32 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2826,19 +2839,19 @@ dependencies = [
  "prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost-build 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "radix_trie 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_canonical_serialization 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_crypto 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_logger 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_proptest_helpers 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_canonical_serialization 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_crypto 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_logger 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_proptest_helpers 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_vm"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2848,16 +2861,16 @@ dependencies = [
  "proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proptest-derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_canonical_serialization 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_crypto 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_proptest_helpers 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_canonical_serialization 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_crypto 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_proptest_helpers 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_vm_cache_map"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "chashmap 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2866,7 +2879,7 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_vm_runtime"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2876,33 +2889,33 @@ dependencies = [
  "proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rental 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_bytecode_verifier 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_canonical_serialization 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_config 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_crypto 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_logger 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_metrics 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_state_view 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm_cache_map 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm_runtime_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_bytecode_verifier 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_canonical_serialization 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_config 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_crypto 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_logger 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_metrics 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_state_view 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_vm 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_vm_cache_map 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_vm_runtime_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "solana_libra_vm_runtime_types"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bit-vec 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_canonical_serialization 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_crypto 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_canonical_serialization 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_crypto 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana_libra_vm 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3708,12 +3721,31 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "0.5.2"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "zeroize_derive 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [metadata]
@@ -3749,7 +3781,6 @@ dependencies = [
 "checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
 "checksum bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10004c15deb332055f7a4a208190aed362cf9a7c2f6ab70a305fba50e1105f38"
-"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum c_linked_list 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b"
 "checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
@@ -3776,6 +3807,7 @@ dependencies = [
 "checksum crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
 "checksum ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113"
 "checksum curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8b7dcd30ba50cdf88b55b033456138b7c0ac4afdc436d82e1b79f370f24cc66d"
+"checksum curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26778518a7f6cffa1d25a44b602b62b979bd88adb9e99ffec546998cf3404839"
 "checksum data-encoding 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4f47ca1860a761136924ddd2422ba77b2ea54fe8cc75b9040804a0d9d32ad97"
 "checksum derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
 "checksum diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a"
@@ -3785,7 +3817,7 @@ dependencies = [
 "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
 "checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969"
 "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
-"checksum ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81956bcf7ef761fb4e1d88de3fa181358a0d26cbcb9755b587a08f9119824b86"
+"checksum ed25519-dalek 1.0.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)" = "978710b352437433c97b2bff193f2fb1dfd58a093f863dd95e225a19baa599a2"
 "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 "checksum ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8944dc8fa28ce4a38f778bd46bf7d923fe73eed5a439398507246c8e017e6f36"
 "checksum encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)" = "87240518927716f79692c2ed85bfe6e98196d18c6401ec75355760233a7e12e9"
@@ -3930,7 +3962,7 @@ dependencies = [
 "checksum rand04 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "58595cc8bb12add45412667f9b422d5a9842d61d36e8607bc7c84ff738bf9263"
 "checksum rand04_compat 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e4cc0eb4bbb0cbc6c2a8081aa11303b9520369eea474cf865f7b7e3f11b284b"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
+"checksum rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
 "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 "checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 "checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
@@ -3940,6 +3972,7 @@ dependencies = [
 "checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
 "checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
 "checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+"checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
 "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 "checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
 "checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
@@ -3984,28 +4017,28 @@ dependencies = [
 "checksum slog-stdlog 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be4d87903baf655da2d82bc3ac3f7ef43868c58bf712b3a661fda72009304c23"
 "checksum slog-term 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "54b50e85b73c2bd42ceb97b6ded235576d405bd1e974242ccfe634fa269f6da7"
 "checksum smallvec 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cefaa50e76a6f10b86f36e640eb1739eafbd4084865067778463913e43a77ff3"
-"checksum solana_libra_bytecode_verifier 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "79c3b7e9555da6f04a3f542a40e92bbbd46d0f05bd270ae3ff8c0283c329a179"
-"checksum solana_libra_canonical_serialization 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "c674689dd2d17b0bab49501f0d63ec71b3e1f8fab2eae86174e37768435a54aa"
-"checksum solana_libra_compiler 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "908b00b637e6eaf835d67bea2329bbee82e75f8e162744fd707ca9c9e4c1400b"
-"checksum solana_libra_config 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf4d6ccf7fd4f76e92783224914e310374438600990c6fb4514e84baa9bb9cbb"
-"checksum solana_libra_crypto 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "93bc8beed515da88169c43e87dc0ef518d48d9d6d639700af6a9768c04f7bf0a"
-"checksum solana_libra_crypto-derive 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "17d1e61262565aea4fc2a41848e58e49ce4287edbd0aa65f6b17004f64eb36ee"
-"checksum solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f1add7897a1ac91f0a8d3c6b71a577eab03800fb1c715eb70bf4bcd0abd27f"
-"checksum solana_libra_failure_macros 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "f9fb2b4161a853c17f0074719427551d34cb4c68affa098a0ac5d0721034607e"
-"checksum solana_libra_ir_to_bytecode 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "290f4322e54e0ba347729cf17bd1f9145d49dcf927ea3d1d1817e224692ebad6"
-"checksum solana_libra_ir_to_bytecode_syntax 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "90f56eccaf25ef145f814f82eeb5dcfbac1d4b025b9e4d15b0b760987afa4ab0"
-"checksum solana_libra_logger 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "9b43115806f8f24055c36af78e0f9af9f93952d6ee2806a6bfb569834dd05ac9"
-"checksum solana_libra_metrics 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "238dcafcf6934a501732981138c70c577b59371ed18ef2dac572e0ad2d836aed"
-"checksum solana_libra_nibble 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "4b9937c68d78bb2287bd180f10539766974ac4f6ddde8946bf78a3dce5a0a654"
-"checksum solana_libra_proptest_helpers 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "6bde114ef094aa4b43eeaa01ef1bf3a6f9dc9608988737bf12a93186f14dbfa3"
-"checksum solana_libra_state_view 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "542d26b2c35dc879f77a311b657c5f89caae34d3ecef115061062a720c12f619"
-"checksum solana_libra_stdlib 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "b462ea5089ecd469f5d8b419b7b31cac30a1d5957ad6d222792ab6077a5fed49"
-"checksum solana_libra_tools 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "5214c4a84a097b03ddd1b73a6b287252e4b77226658f0b6abcbab634325d5b5c"
-"checksum solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "06f40fce42cdb6ab6b12bb150d0336eacc1170dc62db4cdef77bca47b41c0a79"
-"checksum solana_libra_vm 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "14ecbd2cce1e5375b450262f119d18015fb3370eb1004b8098564d9634fe26b7"
-"checksum solana_libra_vm_cache_map 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "37fa2e1f00a87514cd2169149a5f81a89279703b2523979688d6ef84081a4690"
-"checksum solana_libra_vm_runtime 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "ff9f8a7b8212dc4ece5d93f2839896e633c34d7463856e4a555cbcb5c67e9c26"
-"checksum solana_libra_vm_runtime_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "254c23c8f30e7c82ae4dc6694e743400d674c66d371b700eec03378ba994f00b"
+"checksum solana_libra_bytecode_verifier 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "dd72dfd0637c9f15ec52ef5739d92594ba38ad0e644720e882b28f85afef1132"
+"checksum solana_libra_canonical_serialization 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fe30d99c623682886f986147887f7b5b14f6ac290da5801163beb22f42ad1f"
+"checksum solana_libra_compiler 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "72384762bc7e859c7ac8a45dbf3e29b2913467a45d3e015982ec676e72181c22"
+"checksum solana_libra_config 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "d0f419b7ea9bc1689c774c695ede05b4c285030a948b09fad0fadb7b0631600e"
+"checksum solana_libra_crypto 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "0bf6484e75e14d60d018408fe1f6b7a7b3b46814638935b145f1a3cb16eb3ec9"
+"checksum solana_libra_crypto-derive 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "67801085b6adee0d30caa77d126bbceafa4b9bb8f4c7871e29638faa20dcd8b1"
+"checksum solana_libra_failure_ext 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "855b1630e51456c58cb73ff6182b61a40c500dcaf5512ccf359a461225b58511"
+"checksum solana_libra_failure_macros 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf1d38966c68be541232f166205f352f16defd665f50d6db1f1736872d716af"
+"checksum solana_libra_ir_to_bytecode 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8b20477a89c89fc10b18b5f6d01f2c8d58c363e49a6b8db208152825622c051"
+"checksum solana_libra_ir_to_bytecode_syntax 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "99492e984c4f283b561385d5bb15a63bdf55e8f741477e00f8e57b8934749bd0"
+"checksum solana_libra_logger 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "62fb1d124421fda39a5d872c8b5add50ce7cf43a88505e0aea702a575127a3c8"
+"checksum solana_libra_metrics 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "94edebdee2305eabf8ccd7571eecaaa4328d4aba493c3a3e988db67230a8a8c4"
+"checksum solana_libra_nibble 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8f40b8a06a508a618a23be932d07c2dc0a87a152f98dafc451d1bedb3a9c0c8"
+"checksum solana_libra_proptest_helpers 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "e098b96303a5fc002a12f67692fd9271372d86fd0a82774153933324125567e2"
+"checksum solana_libra_state_view 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "9cd9ace92273edf4f681d6a9dcb93ed8f444e0a4db45efc3ffd26ff35eea4051"
+"checksum solana_libra_stdlib 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "c56b6211942fba07b187288fa22ff6bce829337c3982427431501edab017bfd4"
+"checksum solana_libra_tools 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "b3415a2dd54cfe45a58639cac065c285a86bf31364e4a944d6ff9ff37b87a05e"
+"checksum solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4524f25618443c6e1081bd141d9cf76fb76471c8da8dcd8c6e5057a0cd331b7"
+"checksum solana_libra_vm 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "7f970fd967e20709b9fa131a0764a91128fe8583859bc23cdf82b7a3e98ef3cd"
+"checksum solana_libra_vm_cache_map 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "332cdd6a4c4c1d72aee9fb495d190c7338cdaf38179a2d624b51e0e25bdc852d"
+"checksum solana_libra_vm_runtime 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "804a1a7ce9fa28f3281a5cbb1d2747917d1a4d80f954243592da77389539a9ef"
+"checksum solana_libra_vm_runtime_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)" = "790621a290a17a41cec0883decc861b2102b5d4d9f638492bbc55613ea142e85"
 "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
 "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
@@ -4095,4 +4128,6 @@ dependencies = [
 "checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"
 "checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-"checksum x25519-dalek 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7ee1585dc1484373cbc1cee7aafda26634665cf449436fd6e24bfd1fad230538"
+"checksum x25519-dalek 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217"
+"checksum zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8"
+"checksum zeroize_derive 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
diff --git a/programs/librapay/Cargo.toml b/programs/librapay/Cargo.toml
index e445c71b4..1966b581b 100644
--- a/programs/librapay/Cargo.toml
+++ b/programs/librapay/Cargo.toml
@@ -15,7 +15,7 @@ solana-logger = { path = "../../logger", version = "1.2.0" }
 solana-move-loader-program = { path = "../move_loader", version = "1.2.0" }
 solana-runtime = { path = "../../runtime", version = "1.2.0" }
 solana-sdk = { path = "../../sdk", version = "1.2.0" }
-types = { version = "0.0.1-sol4", package = "solana_libra_types" }
+types = { version = "0.0.1-sol5", package = "solana_libra_types" }
 
 [lib]
 crate-type = ["lib", "cdylib"]
diff --git a/programs/move_loader/Cargo.lock b/programs/move_loader/Cargo.lock
index cd0f57a64..be6ff6d0b 100644
--- a/programs/move_loader/Cargo.lock
+++ b/programs/move_loader/Cargo.lock
@@ -253,15 +253,6 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
 
-[[package]]
-name = "c2-chacha"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-dependencies = [
- "ppv-lite86",
-]
-
 [[package]]
 name = "c_linked_list"
 version = "1.1.1"
@@ -508,6 +499,19 @@ dependencies = [
  "subtle 2.2.2",
 ]
 
+[[package]]
+name = "curve25519-dalek"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26778518a7f6cffa1d25a44b602b62b979bd88adb9e99ffec546998cf3404839"
+dependencies = [
+ "byteorder",
+ "digest",
+ "rand_core 0.5.1",
+ "subtle 2.2.2",
+ "zeroize",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.2.0"
@@ -593,14 +597,13 @@ checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
 
 [[package]]
 name = "ed25519-dalek"
-version = "1.0.0-pre.1"
+version = "1.0.0-pre.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81956bcf7ef761fb4e1d88de3fa181358a0d26cbcb9755b587a08f9119824b86"
+checksum = "978710b352437433c97b2bff193f2fb1dfd58a093f863dd95e225a19baa599a2"
 dependencies = [
  "clear_on_drop",
- "curve25519-dalek",
- "failure",
- "rand 0.6.5",
+ "curve25519-dalek 2.0.0",
+ "rand 0.7.3",
  "serde",
  "sha2",
 ]
@@ -1909,7 +1912,7 @@ dependencies = [
  "rand_isaac",
  "rand_jitter",
  "rand_os",
- "rand_pcg",
+ "rand_pcg 0.1.2",
  "rand_xorshift",
  "winapi 0.3.8",
 ]
@@ -1922,9 +1925,10 @@ checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
  "getrandom",
  "libc",
- "rand_chacha 0.2.1",
+ "rand_chacha 0.2.2",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
+ "rand_pcg 0.2.1",
 ]
 
 [[package]]
@@ -1958,11 +1962,11 @@ dependencies = [
 
 [[package]]
 name = "rand_chacha"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
 dependencies = [
- "c2-chacha",
+ "ppv-lite86",
  "rand_core 0.5.1",
 ]
 
@@ -2052,6 +2056,15 @@ dependencies = [
  "rand_core 0.4.2",
 ]
 
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
 [[package]]
 name = "rand_xorshift"
 version = "0.1.1"
@@ -2547,13 +2560,13 @@ dependencies = [
  "backtrace",
  "bytes 0.4.12",
  "cc",
- "curve25519-dalek",
+ "curve25519-dalek 2.0.0",
  "ed25519-dalek",
  "either",
  "failure",
  "lazy_static",
  "libc",
- "rand_chacha 0.1.1",
+ "rand_chacha 0.2.2",
  "regex-syntax",
  "reqwest",
  "serde",
@@ -2621,8 +2634,8 @@ dependencies = [
  "num-derive",
  "num-traits",
  "pbkdf2",
- "rand 0.6.5",
- "rand_chacha 0.1.1",
+ "rand 0.7.3",
+ "rand_chacha 0.2.2",
  "serde",
  "serde_bytes",
  "serde_derive",
@@ -2646,9 +2659,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_bytecode_verifier"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79c3b7e9555da6f04a3f542a40e92bbbd46d0f05bd270ae3ff8c0283c329a179"
+checksum = "dd72dfd0637c9f15ec52ef5739d92594ba38ad0e644720e882b28f85afef1132"
 dependencies = [
  "mirai-annotations",
  "petgraph",
@@ -2660,9 +2673,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_canonical_serialization"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c674689dd2d17b0bab49501f0d63ec71b3e1f8fab2eae86174e37768435a54aa"
+checksum = "d4fe30d99c623682886f986147887f7b5b14f6ac290da5801163beb22f42ad1f"
 dependencies = [
  "byteorder",
  "solana_libra_failure_ext",
@@ -2670,9 +2683,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_compiler"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "908b00b637e6eaf835d67bea2329bbee82e75f8e162744fd707ca9c9e4c1400b"
+checksum = "72384762bc7e859c7ac8a45dbf3e29b2913467a45d3e015982ec676e72181c22"
 dependencies = [
  "serde_json",
  "solana_libra_bytecode_verifier",
@@ -2686,16 +2699,16 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_config"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d6ccf7fd4f76e92783224914e310374438600990c6fb4514e84baa9bb9cbb"
+checksum = "d0f419b7ea9bc1689c774c695ede05b4c285030a948b09fad0fadb7b0631600e"
 dependencies = [
  "get_if_addrs",
  "hex 0.3.2",
  "mirai-annotations",
  "parity-multiaddr",
  "prost",
- "rand 0.6.5",
+ "rand 0.7.3",
  "serde",
  "solana_libra_crypto",
  "solana_libra_failure_ext",
@@ -2707,14 +2720,14 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_crypto"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93bc8beed515da88169c43e87dc0ef518d48d9d6d639700af6a9768c04f7bf0a"
+checksum = "0bf6484e75e14d60d018408fe1f6b7a7b3b46814638935b145f1a3cb16eb3ec9"
 dependencies = [
  "bincode",
  "byteorder",
  "bytes 0.4.12",
- "curve25519-dalek",
+ "curve25519-dalek 1.2.3",
  "digest",
  "ed25519-dalek",
  "hex 0.3.2",
@@ -2723,7 +2736,7 @@ dependencies = [
  "pairing",
  "proptest",
  "proptest-derive",
- "rand 0.6.5",
+ "rand 0.7.3",
  "serde",
  "sha2",
  "sha3",
@@ -2738,9 +2751,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_crypto-derive"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17d1e61262565aea4fc2a41848e58e49ce4287edbd0aa65f6b17004f64eb36ee"
+checksum = "67801085b6adee0d30caa77d126bbceafa4b9bb8f4c7871e29638faa20dcd8b1"
 dependencies = [
  "proc-macro2 1.0.9",
  "quote 1.0.2",
@@ -2749,9 +2762,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_failure_ext"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4f1add7897a1ac91f0a8d3c6b71a577eab03800fb1c715eb70bf4bcd0abd27f"
+checksum = "855b1630e51456c58cb73ff6182b61a40c500dcaf5512ccf359a461225b58511"
 dependencies = [
  "failure",
  "solana_libra_failure_macros",
@@ -2759,15 +2772,15 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_failure_macros"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fb2b4161a853c17f0074719427551d34cb4c68affa098a0ac5d0721034607e"
+checksum = "4bf1d38966c68be541232f166205f352f16defd665f50d6db1f1736872d716af"
 
 [[package]]
 name = "solana_libra_ir_to_bytecode"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f4322e54e0ba347729cf17bd1f9145d49dcf927ea3d1d1817e224692ebad6"
+checksum = "f8b20477a89c89fc10b18b5f6d01f2c8d58c363e49a6b8db208152825622c051"
 dependencies = [
  "codespan",
  "codespan-reporting",
@@ -2781,9 +2794,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_ir_to_bytecode_syntax"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90f56eccaf25ef145f814f82eeb5dcfbac1d4b025b9e4d15b0b760987afa4ab0"
+checksum = "99492e984c4f283b561385d5bb15a63bdf55e8f741477e00f8e57b8934749bd0"
 dependencies = [
  "codespan",
  "hex 0.3.2",
@@ -2797,15 +2810,16 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_logger"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b43115806f8f24055c36af78e0f9af9f93952d6ee2806a6bfb569834dd05ac9"
+checksum = "62fb1d124421fda39a5d872c8b5add50ce7cf43a88505e0aea702a575127a3c8"
 dependencies = [
  "backtrace",
  "chrono",
  "itertools 0.8.2",
  "lazy_static",
- "rand 0.6.5",
+ "rand 0.7.3",
+ "rand_core 0.5.1",
  "serde",
  "serde_json",
  "slog",
@@ -2818,9 +2832,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_metrics"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238dcafcf6934a501732981138c70c577b59371ed18ef2dac572e0ad2d836aed"
+checksum = "94edebdee2305eabf8ccd7571eecaaa4328d4aba493c3a3e988db67230a8a8c4"
 dependencies = [
  "futures",
  "hyper 0.12.35",
@@ -2833,9 +2847,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_nibble"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9937c68d78bb2287bd180f10539766974ac4f6ddde8946bf78a3dce5a0a654"
+checksum = "f8f40b8a06a508a618a23be932d07c2dc0a87a152f98dafc451d1bedb3a9c0c8"
 dependencies = [
  "proptest",
  "serde",
@@ -2843,9 +2857,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_proptest_helpers"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bde114ef094aa4b43eeaa01ef1bf3a6f9dc9608988737bf12a93186f14dbfa3"
+checksum = "e098b96303a5fc002a12f67692fd9271372d86fd0a82774153933324125567e2"
 dependencies = [
  "crossbeam",
  "proptest",
@@ -2854,9 +2868,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_state_view"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "542d26b2c35dc879f77a311b657c5f89caae34d3ecef115061062a720c12f619"
+checksum = "9cd9ace92273edf4f681d6a9dcb93ed8f444e0a4db45efc3ffd26ff35eea4051"
 dependencies = [
  "solana_libra_failure_ext",
  "solana_libra_types",
@@ -2864,9 +2878,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_stdlib"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b462ea5089ecd469f5d8b419b7b31cac30a1d5957ad6d222792ab6077a5fed49"
+checksum = "c56b6211942fba07b187288fa22ff6bce829337c3982427431501edab017bfd4"
 dependencies = [
  "lazy_static",
  "solana_libra_bytecode_verifier",
@@ -2876,19 +2890,19 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_tools"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5214c4a84a097b03ddd1b73a6b287252e4b77226658f0b6abcbab634325d5b5c"
+checksum = "b3415a2dd54cfe45a58639cac065c285a86bf31364e4a944d6ff9ff37b87a05e"
 dependencies = [
  "hex 0.3.2",
- "rand 0.6.5",
+ "rand 0.7.3",
 ]
 
 [[package]]
 name = "solana_libra_types"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06f40fce42cdb6ab6b12bb150d0336eacc1170dc62db4cdef77bca47b41c0a79"
+checksum = "d4524f25618443c6e1081bd141d9cf76fb76471c8da8dcd8c6e5057a0cd331b7"
 dependencies = [
  "bech32",
  "byteorder",
@@ -2903,7 +2917,7 @@ dependencies = [
  "prost",
  "prost-build",
  "radix_trie",
- "rand 0.6.5",
+ "rand 0.7.3",
  "serde",
  "solana_libra_canonical_serialization",
  "solana_libra_crypto",
@@ -2915,9 +2929,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_vm"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14ecbd2cce1e5375b450262f119d18015fb3370eb1004b8098564d9634fe26b7"
+checksum = "7f970fd967e20709b9fa131a0764a91128fe8583859bc23cdf82b7a3e98ef3cd"
 dependencies = [
  "byteorder",
  "hex 0.3.2",
@@ -2935,9 +2949,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_vm_cache_map"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37fa2e1f00a87514cd2169149a5f81a89279703b2523979688d6ef84081a4690"
+checksum = "332cdd6a4c4c1d72aee9fb495d190c7338cdaf38179a2d624b51e0e25bdc852d"
 dependencies = [
  "chashmap",
  "typed-arena",
@@ -2945,9 +2959,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_vm_runtime"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff9f8a7b8212dc4ece5d93f2839896e633c34d7463856e4a555cbcb5c67e9c26"
+checksum = "804a1a7ce9fa28f3281a5cbb1d2747917d1a4d80f954243592da77389539a9ef"
 dependencies = [
  "hex 0.3.2",
  "lazy_static",
@@ -2971,9 +2985,9 @@ dependencies = [
 
 [[package]]
 name = "solana_libra_vm_runtime_types"
-version = "0.0.1-sol4"
+version = "0.0.1-sol5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "254c23c8f30e7c82ae4dc6694e743400d674c66d371b700eec03378ba994f00b"
+checksum = "790621a290a17a41cec0883decc861b2102b5d4d9f638492bbc55613ea142e85"
 dependencies = [
  "bit-vec 0.6.1",
  "lazy_static",
@@ -3886,11 +3900,32 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "0.5.2"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee1585dc1484373cbc1cee7aafda26634665cf449436fd6e24bfd1fad230538"
+checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217"
 dependencies = [
- "clear_on_drop",
- "curve25519-dalek",
- "rand_core 0.3.1",
+ "curve25519-dalek 2.0.0",
+ "rand_core 0.5.1",
+ "zeroize",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
+dependencies = [
+ "proc-macro2 1.0.9",
+ "quote 1.0.2",
+ "syn 1.0.16",
+ "synstructure",
 ]
diff --git a/programs/move_loader/Cargo.toml b/programs/move_loader/Cargo.toml
index 9f64dd261..02af458c1 100644
--- a/programs/move_loader/Cargo.toml
+++ b/programs/move_loader/Cargo.toml
@@ -19,20 +19,20 @@ serde_json = "1.0.46"
 solana-logger = { path = "../../logger", version = "1.2.0" }
 solana-sdk = { path = "../../sdk", version = "1.2.0" }
 
-bytecode_verifier = { version = "0.0.1-sol4", package = "solana_libra_bytecode_verifier" }
-canonical_serialization = { version = "0.0.1-sol4", package = "solana_libra_canonical_serialization" }
-compiler = { version = "0.0.1-sol4", package = "solana_libra_compiler" }
-failure = { version = "0.0.1-sol4", package = "solana_libra_failure_ext" }
+bytecode_verifier = { version = "0.0.1-sol5", package = "solana_libra_bytecode_verifier" }
+canonical_serialization = { version = "0.0.1-sol5", package = "solana_libra_canonical_serialization" }
+compiler = { version = "0.0.1-sol5", package = "solana_libra_compiler" }
+failure = { version = "0.0.1-sol5", package = "solana_libra_failure_ext" }
 num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
-state_view = { version = "0.0.1-sol4", package = "solana_libra_state_view" }
-stdlib = { version = "0.0.1-sol4", package = "solana_libra_stdlib" }
+state_view = { version = "0.0.1-sol5", package = "solana_libra_state_view" }
+stdlib = { version = "0.0.1-sol5", package = "solana_libra_stdlib" }
 thiserror = "1.0"
-types = { version = "0.0.1-sol4", package = "solana_libra_types" }
-vm = { version = "0.0.1-sol4", package = "solana_libra_vm" }
-vm_cache_map = { version = "0.0.1-sol4", package = "solana_libra_vm_cache_map" }
-vm_runtime = { version = "0.0.1-sol4", package = "solana_libra_vm_runtime" }
-vm_runtime_types = { version = "0.0.1-sol4", package = "solana_libra_vm_runtime_types" }
+types = { version = "0.0.1-sol5", package = "solana_libra_types" }
+vm = { version = "0.0.1-sol5", package = "solana_libra_vm" }
+vm_cache_map = { version = "0.0.1-sol5", package = "solana_libra_vm_cache_map" }
+vm_runtime = { version = "0.0.1-sol5", package = "solana_libra_vm_runtime" }
+vm_runtime_types = { version = "0.0.1-sol5", package = "solana_libra_vm_runtime_types" }
 
 [lib]
 crate-type = ["lib", "cdylib"]