diff --git a/Cargo.lock b/Cargo.lock
index 6756990808..53d3fe06b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,56 +8,56 @@ checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 
 [[package]]
 name = "aead"
-version = "0.3.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
+checksum = "4cf01b9b56e767bb57b94ebf91a58b338002963785cdd7013e21c0d4679471e4"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.12.3",
 ]
 
 [[package]]
 name = "aes"
-version = "0.4.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7001367fde4c768a19d1029f0a8be5abd9308e1119846d5bd9ad26297b8faf5"
+checksum = "54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9"
 dependencies = [
  "aes-soft",
  "aesni",
- "block-cipher",
+ "block-cipher-trait",
 ]
 
 [[package]]
 name = "aes-gcm"
-version = "0.6.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f5007801316299f922a6198d1d09a0bae95786815d066d5880d13f7c45ead1"
+checksum = "54e6fb62c3640759142eb73015f57eece23832fde0a7ccd8be17d7ccbd01f21c"
 dependencies = [
  "aead",
  "aes",
- "block-cipher",
  "ghash",
- "subtle 2.2.3",
+ "subtle 2.2.2",
+ "zeroize 1.1.0",
 ]
 
 [[package]]
 name = "aes-soft"
-version = "0.4.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4925647ee64e5056cf231608957ce7c81e12d6d6e316b9ce1404778cc1d35fa7"
+checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d"
 dependencies = [
- "block-cipher",
+ "block-cipher-trait",
  "byteorder",
- "opaque-debug 0.2.3",
+ "opaque-debug",
 ]
 
 [[package]]
 name = "aesni"
-version = "0.7.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050d39b0b7688b3a3254394c3e30a9d66c41dcf9b05b0e2dbdc623f6505d264"
+checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100"
 dependencies = [
- "block-cipher",
- "opaque-debug 0.2.3",
+ "block-cipher-trait",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -209,9 +209,9 @@ checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72"
 
 [[package]]
 name = "bincode"
-version = "1.3.1"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d"
+checksum = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf"
 dependencies = [
  "byteorder",
  "serde",
@@ -272,15 +272,14 @@ dependencies = [
 
 [[package]]
 name = "blake2"
-version = "0.9.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84ce5b6108f8e154604bd4eb76a2f726066c3464d5a552a4229262a18c9bb471"
+checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
 dependencies = [
  "byte-tools",
- "byteorder",
- "crypto-mac 0.8.0",
- "digest 0.9.0",
- "opaque-debug 0.2.3",
+ "crypto-mac",
+ "digest",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -300,29 +299,19 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 dependencies = [
- "block-padding 0.1.5",
+ "block-padding",
  "byte-tools",
  "byteorder",
  "generic-array 0.12.3",
 ]
 
 [[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "block-padding 0.2.1",
- "generic-array 0.14.4",
-]
-
-[[package]]
-name = "block-cipher"
-version = "0.7.1"
+name = "block-cipher-trait"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa136449e765dc7faa244561ccae839c394048667929af599b5d931ebe7b7f10"
+checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.12.3",
 ]
 
 [[package]]
@@ -334,12 +323,6 @@ dependencies = [
  "byte-tools",
 ]
 
-[[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
 [[package]]
 name = "bs58"
 version = "0.3.1"
@@ -367,18 +350,19 @@ checksum = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
 [[package]]
 name = "bulletproofs"
 version = "2.0.0"
-source = "git+https://github.com/eranrund/bulletproofs?rev=e8e8ef45ecc6d31f1a9525140edc977351d0f780#e8e8ef45ecc6d31f1a9525140edc977351d0f780"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e6731420b125f0300427b4f7d146a7c161b02801c126bed8b66c8e1340f574"
 dependencies = [
  "byteorder",
  "clear_on_drop",
  "curve25519-dalek",
- "digest 0.9.0",
+ "digest",
  "merlin",
  "rand_core 0.5.1",
  "serde",
  "serde_derive",
  "sha3",
- "subtle 2.2.3",
+ "subtle 2.2.2",
 ]
 
 [[package]]
@@ -523,9 +507,9 @@ dependencies = [
 
 [[package]]
 name = "clear_on_drop"
-version = "0.2.4"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9cc5db465b294c3fa986d5bbb0f3017cd850bff6dd6c52f9ccff8b4d21b7b08"
+checksum = "97276801e127ffb46b66ce23f35cc96bd454fa311294bced4bbace7baa8b1d17"
 dependencies = [
  "cc",
 ]
@@ -572,12 +556,12 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
 name = "cookie"
-version = "0.11.3"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5795cda0897252e34380a27baf884c53aa7ad9990329cdad96d4c5d027015d44"
+checksum = "d9fac5e7bdefb6160fb181ee0eaa6f96704b625c70e6d61c465cb35750a4ea12"
 dependencies = [
- "percent-encoding 2.1.0",
  "time",
+ "url 1.7.2",
 ]
 
 [[package]]
@@ -596,11 +580,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 
-[[package]]
-name = "cpuid-bool"
-version = "0.1.2"
-source = "git+https://github.com/eranrund/RustCrypto-utils?rev=e00f5f16e395349c2c2395aac9287da0ac843a73#e00f5f16e395349c2c2395aac9287da0ac843a73"
-
 [[package]]
 name = "crc"
 version = "1.8.1"
@@ -630,7 +609,7 @@ dependencies = [
  "clap",
  "criterion-plot",
  "csv",
- "itertools",
+ "itertools 0.9.0",
  "lazy_static",
  "num-traits",
  "oorandom",
@@ -651,7 +630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddeaf7989f00f2e1d871a26a110f3ed713632feac17f65f03ca938c542618b60"
 dependencies = [
  "cast",
- "itertools",
+ "itertools 0.9.0",
 ]
 
 [[package]]
@@ -769,16 +748,6 @@ dependencies = [
  "subtle 1.0.0",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
-dependencies = [
- "generic-array 0.14.4",
- "subtle 2.2.3",
-]
-
 [[package]]
 name = "csv"
 version = "1.1.3"
@@ -822,45 +791,19 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "3.0.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8492de420e9e60bc9a1d66e2dbb91825390b738a388606600663fc529b4b307"
+checksum = "26778518a7f6cffa1d25a44b602b62b979bd88adb9e99ffec546998cf3404839"
 dependencies = [
  "byteorder",
- "digest 0.9.0",
+ "digest",
  "packed_simd",
  "rand_core 0.5.1",
  "serde",
- "subtle 2.2.3",
+ "subtle 2.2.2",
  "zeroize 1.1.0",
 ]
 
-[[package]]
-name = "datatest"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8f692fd1a1d2e19fe7e88ff0e7c3c7dd74d86a7d6ff3daa08c796ac2e26a100"
-dependencies = [
- "ctor",
- "datatest-derive",
- "regex",
- "serde",
- "serde_yaml",
- "walkdir",
- "yaml-rust",
-]
-
-[[package]]
-name = "datatest-derive"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7f6869fa6dc3d62b5bde5011ba43cdb760336269b3f87a94b9865983b037292"
-dependencies = [
- "proc-macro2 1.0.12",
- "quote 1.0.4",
- "syn 1.0.18",
-]
-
 [[package]]
 name = "debugid"
 version = "0.7.2"
@@ -929,15 +872,6 @@ dependencies = [
  "generic-array 0.12.3",
 ]
 
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array 0.14.4",
-]
-
 [[package]]
 name = "dirs"
 version = "1.0.5"
@@ -973,9 +907,9 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.1.7"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc2ab4d5a16117f9029e9a6b5e4e79f4c67f6519bc134210d4d4a04ba31f41b"
+checksum = "e6269d127174b18c665e683e23c2c55d3735fadbec4181c7c70b0450b764bfa5"
 dependencies = [
  "proc-macro2 1.0.12",
  "quote 1.0.4",
@@ -993,12 +927,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "downcast"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb454f0228b18c7f4c3b0ebbee346ed9c52e7443b0999cd543ff3571205701d"
-
 [[package]]
 name = "dtoa"
 version = "0.4.5"
@@ -1017,15 +945,13 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d2e93f837d749c16d118e7ddf7a4dfd0ac8f452cf51e46e9348824e5ef6851"
+version = "1.0.0-pre.3"
+source = "git+https://github.com/cbeck88/ed25519-dalek?rev=c0b0ab31d3572de6fb01d6b4a4f052784034b0b2#c0b0ab31d3572de6fb01d6b4a4f052784034b0b2"
 dependencies = [
  "curve25519-dalek",
- "ed25519",
  "rand 0.7.3",
  "serde",
- "sha2 0.9.1",
+ "sha2",
  "zeroize 1.1.0",
 ]
 
@@ -1125,27 +1051,12 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "float-cmp"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 
-[[package]]
-name = "fragile"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2"
-
 [[package]]
 name = "fs_extra"
 version = "1.1.0"
@@ -1199,36 +1110,20 @@ version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
 
-[[package]]
-name = "futures"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
 [[package]]
 name = "futures-channel"
-version = "0.3.5"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
+checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
 dependencies = [
  "futures-core",
- "futures-sink",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.5"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
+checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
 
 [[package]]
 name = "futures-cpupool"
@@ -1236,32 +1131,21 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 dependencies = [
- "futures 0.1.29",
+ "futures",
  "num_cpus",
 ]
 
-[[package]]
-name = "futures-executor"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
 [[package]]
 name = "futures-io"
-version = "0.3.5"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
+checksum = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.5"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
+checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2 1.0.12",
@@ -1271,33 +1155,27 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.5"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
+checksum = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
 
 [[package]]
 name = "futures-task"
-version = "0.3.5"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
-dependencies = [
- "once_cell",
-]
+checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
 
 [[package]]
 name = "futures-util"
-version = "0.3.5"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
+checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
 dependencies = [
- "futures-channel",
  "futures-core",
  "futures-io",
  "futures-macro",
- "futures-sink",
  "futures-task",
  "memchr",
- "pin-project",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -1310,18 +1188,17 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
 dependencies = [
+ "serde",
  "typenum",
 ]
 
 [[package]]
 name = "generic-array"
-version = "0.14.4"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"
 dependencies = [
- "serde",
  "typenum",
- "version_check 0.9.1",
 ]
 
 [[package]]
@@ -1346,9 +1223,9 @@ dependencies = [
 
 [[package]]
 name = "ghash"
-version = "0.3.0"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6e27f0689a6e15944bdce7e45425efb87eaa8ab0c6e87f11d0987a9133e2531"
+checksum = "9f0930ed19a7184089ea46d2fedead2f6dc2b674c5db4276b7da336c7cd83252"
 dependencies = [
  "polyval",
 ]
@@ -1367,32 +1244,32 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "grpcio"
-version = "0.6.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63fac32f9f74fa1fd78215d04b47f134c1ee5a535c237a54d52bf18cf65ac983"
+checksum = "a779eb8dc982fa4a552eb21e2962b2d927ea9037cb21be8645034c9e79ee4a29"
 dependencies = [
- "futures 0.3.5",
+ "futures",
  "grpcio-sys",
  "libc",
  "log 0.4.8",
- "parking_lot 0.10.2",
  "protobuf",
 ]
 
 [[package]]
 name = "grpcio-compiler"
-version = "0.6.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad76ae5de2e2d85fe8f45e072f7909e22fa9ffaf0d53b280825783720dab051c"
+checksum = "373a14f0f994d4c235770f4bb5558be00626844db130a82a70142b8fc5996fc3"
 dependencies = [
  "protobuf",
+ "protobuf-codegen",
 ]
 
 [[package]]
 name = "grpcio-sys"
-version = "0.6.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12d4e9309f1151c9ebcd07622858c4a504b6ea6cd2821524fe74ccde8ea830d7"
+checksum = "1b3080bdcfde08451cc7994f0b7c0c71c638629f8fb0049217af76a69d0742c3"
 dependencies = [
  "bindgen",
  "cc",
@@ -1412,9 +1289,9 @@ dependencies = [
  "byteorder",
  "bytes 0.4.12",
  "fnv",
- "futures 0.1.29",
+ "futures",
  "http 0.1.21",
- "indexmap 1.3.2",
+ "indexmap",
  "log 0.4.8",
  "slab",
  "string",
@@ -1433,7 +1310,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.1",
- "indexmap 1.3.2",
+ "indexmap",
  "log 0.4.8",
  "slab",
  "tokio 0.2.20",
@@ -1500,12 +1377,12 @@ checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f"
 
 [[package]]
 name = "hkdf"
-version = "0.9.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe1149865383e4526a43aee8495f9a325f0b806c63ce6427d06336a590abbbc9"
+checksum = "3fa08a006102488bd9cd5b8013aabe84955cf5ae22e304c2caf655b633aefae3"
 dependencies = [
- "digest 0.9.0",
- "hmac 0.8.1",
+ "digest",
+ "hmac",
 ]
 
 [[package]]
@@ -1514,18 +1391,8 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695"
 dependencies = [
- "crypto-mac 0.7.0",
- "digest 0.8.1",
-]
-
-[[package]]
-name = "hmac"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
-dependencies = [
- "crypto-mac 0.8.0",
- "digest 0.9.0",
+ "crypto-mac",
+ "digest",
 ]
 
 [[package]]
@@ -1578,7 +1445,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures",
  "http 0.1.21",
  "tokio-buf",
 ]
@@ -1640,7 +1507,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures",
  "futures-cpupool",
  "h2 0.1.26",
  "http 0.1.21",
@@ -1695,7 +1562,7 @@ checksum = "719d85c7df4a7f309a77d145340a063ea929dcb2e025bae46a80345cffec2952"
 dependencies = [
  "bytes 0.4.12",
  "ct-logs",
- "futures 0.1.29",
+ "futures",
  "hyper 0.12.35",
  "rustls 0.16.0",
  "tokio-io",
@@ -1758,12 +1625,6 @@ dependencies = [
  "version_check 0.9.1",
 ]
 
-[[package]]
-name = "indexmap"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7164c96d6e18ccc3ce43f3dedac996c21a220670a106c275b96ad92110401362"
-
 [[package]]
 name = "indexmap"
 version = "1.3.2"
@@ -1814,6 +1675,15 @@ dependencies = [
  "libc",
 ]
 
+[[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"
@@ -1910,26 +1780,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "linked-hash-map"
-version = "0.5.3"
+name = "lmdb"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
-
-[[package]]
-name = "lmdb-rkv"
-version = "0.14.0"
-source = "git+https://github.com/mozilla/lmdb-rs?rev=df1c2f5#df1c2f56e3088f097c719c57b9925ab51e26f3f4"
+checksum = "5b0908efb5d6496aa977d96f91413da2635a902e5e31dbef0bfb88986c248539"
 dependencies = [
  "bitflags",
- "byteorder",
  "libc",
- "lmdb-rkv-sys",
+ "lmdb-sys",
 ]
 
 [[package]]
-name = "lmdb-rkv-sys"
-version = "0.11.0"
-source = "git+https://github.com/mozilla/lmdb-rs?rev=df1c2f5#df1c2f56e3088f097c719c57b9925ab51e26f3f4"
+name = "lmdb-sys"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5b392838cfe8858e86fac37cf97a0e8c55cc60ba0a18365cadc33092f128ce9"
 dependencies = [
  "cc",
  "libc",
@@ -1972,12 +1837,6 @@ dependencies = [
  "hashbrown 0.5.0",
 ]
 
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -2021,59 +1880,13 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "mc-account-keys"
-version = "0.6.0"
-dependencies = [
- "blake2",
- "criterion",
- "curve25519-dalek",
- "datatest",
- "digest 0.9.0",
- "displaydoc",
- "hkdf",
- "mc-account-keys-test-vectors",
- "mc-crypto-digestible",
- "mc-crypto-hashes",
- "mc-crypto-keys",
- "mc-crypto-sig",
- "mc-util-from-random",
- "mc-util-repr-bytes",
- "mc-util-serial",
- "mc-util-test-helper",
- "mc-util-test-vectors",
- "prost",
- "rand 0.7.3",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
- "tempdir",
- "zeroize 1.1.0",
-]
-
-[[package]]
-name = "mc-account-keys-test-vectors"
-version = "0.6.0"
-dependencies = [
- "mc-account-keys-test-vectors-structs",
- "mc-util-test-vectors",
-]
-
-[[package]]
-name = "mc-account-keys-test-vectors-structs"
-version = "0.6.0"
-dependencies = [
- "mc-account-keys",
- "mc-crypto-keys",
- "mc-util-test-vectors",
- "serde",
-]
-
 [[package]]
 name = "mc-admin-http-gateway"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "grpcio",
  "mc-common",
+ "mc-connection",
  "mc-util-grpc",
  "mc-util-uri",
  "rocket",
@@ -2086,14 +1899,10 @@ dependencies = [
 
 [[package]]
 name = "mc-api"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
- "bs58",
  "cargo-emit",
- "crc",
  "curve25519-dalek",
- "displaydoc",
- "mc-account-keys",
  "mc-common",
  "mc-crypto-keys",
  "mc-transaction-core",
@@ -2104,19 +1913,17 @@ dependencies = [
  "mc-util-from-random",
  "mc-util-repr-bytes",
  "mc-util-serial",
- "mc-util-test-helper",
- "prost",
  "protobuf",
  "rand 0.7.3",
 ]
 
 [[package]]
 name = "mc-attest-ake"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "aead",
  "aes-gcm",
- "digest 0.9.0",
+ "digest",
  "failure",
  "mc-attest-core",
  "mc-attest-net",
@@ -2126,21 +1933,21 @@ dependencies = [
  "mc-sgx-build",
  "mc-util-encodings",
  "mc-util-from-random",
- "prost",
+ "mc-util-serial",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
  "serde",
- "sha2 0.9.1",
+ "sha2",
 ]
 
 [[package]]
 name = "mc-attest-api"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "aead",
  "cargo-emit",
- "digest 0.9.0",
- "futures 0.3.5",
+ "digest",
+ "futures",
  "grpcio",
  "mc-attest-ake",
  "mc-attest-enclave-api",
@@ -2154,17 +1961,15 @@ dependencies = [
 
 [[package]]
 name = "mc-attest-core"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "binascii",
- "bincode",
  "bitflags",
  "cfg-if",
  "chrono",
- "digest 0.9.0",
- "displaydoc",
+ "digest",
  "failure",
- "generic-array 0.14.4",
+ "generic-array 0.12.3",
  "hex 0.3.2",
  "hex_fmt",
  "mbedtls",
@@ -2182,13 +1987,13 @@ dependencies = [
  "rand_hc 0.2.0",
  "rjson",
  "serde",
- "sha2 0.9.1",
- "subtle 2.2.3",
+ "sha2",
+ "subtle 2.2.2",
 ]
 
 [[package]]
 name = "mc-attest-enclave-api"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "failure",
  "mc-attest-ake",
@@ -2200,7 +2005,7 @@ dependencies = [
 
 [[package]]
 name = "mc-attest-net"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cfg-if",
  "failure",
@@ -2214,12 +2019,12 @@ dependencies = [
  "rand 0.7.3",
  "reqwest",
  "serde_json",
- "sha2 0.9.1",
+ "sha2",
 ]
 
 [[package]]
 name = "mc-attest-trusted"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "failure",
  "mc-attest-core",
@@ -2231,7 +2036,7 @@ dependencies = [
 
 [[package]]
 name = "mc-attest-untrusted"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "mc-attest-core",
  "mc-sgx-build",
@@ -2240,14 +2045,14 @@ dependencies = [
 
 [[package]]
 name = "mc-common"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "backtrace",
  "binascii",
  "cfg-if",
  "chrono",
  "failure",
- "generic-array 0.14.4",
+ "generic-array 0.12.3",
  "hashbrown 0.6.3",
  "hex_fmt",
  "hostname 0.1.5",
@@ -2278,7 +2083,7 @@ dependencies = [
 
 [[package]]
 name = "mc-connection"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "aes-gcm",
  "failure",
@@ -2292,7 +2097,6 @@ dependencies = [
  "mc-crypto-noise",
  "mc-crypto-rand",
  "mc-transaction-core",
- "mc-util-grpc",
  "mc-util-host-cert",
  "mc-util-serial",
  "mc-util-uri",
@@ -2301,13 +2105,13 @@ dependencies = [
  "retry",
  "secrecy",
  "serde",
- "sha2 0.9.1",
+ "sha2",
  "tempdir",
 ]
 
 [[package]]
 name = "mc-connection-test-utils"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "mc-connection",
  "mc-ledger-db",
@@ -2317,10 +2121,10 @@ dependencies = [
 
 [[package]]
 name = "mc-consensus-api"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
- "futures 0.3.5",
+ "futures",
  "grpcio",
  "mc-api",
  "mc-attest-api",
@@ -2332,7 +2136,7 @@ dependencies = [
 
 [[package]]
 name = "mc-consensus-enclave"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
  "mc-attest-core",
@@ -2346,7 +2150,7 @@ dependencies = [
  "mc-sgx-backtrace-edl",
  "mc-sgx-debug-edl",
  "mc-sgx-panic-edl",
- "mc-sgx-report-cache-api",
+ "mc-sgx-slog",
  "mc-sgx-slog-edl",
  "mc-sgx-types",
  "mc-sgx-urts",
@@ -2359,7 +2163,7 @@ dependencies = [
 
 [[package]]
 name = "mc-consensus-enclave-api"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cfg-if",
  "failure",
@@ -2371,7 +2175,6 @@ dependencies = [
  "mc-crypto-message-cipher",
  "mc-crypto-noise",
  "mc-sgx-compat",
- "mc-sgx-report-cache-api",
  "mc-transaction-core",
  "mc-util-serial",
  "serde",
@@ -2379,7 +2182,7 @@ dependencies = [
 
 [[package]]
 name = "mc-consensus-enclave-edl"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
  "mc-util-build-script",
@@ -2387,12 +2190,11 @@ dependencies = [
 
 [[package]]
 name = "mc-consensus-enclave-impl"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cfg-if",
- "digest 0.9.0",
+ "digest",
  "mbedtls",
- "mc-account-keys",
  "mc-attest-core",
  "mc-attest-enclave-api",
  "mc-attest-trusted",
@@ -2400,29 +2202,26 @@ dependencies = [
  "mc-consensus-enclave-api",
  "mc-crypto-ake-enclave",
  "mc-crypto-digestible",
- "mc-crypto-hashes",
  "mc-crypto-keys",
  "mc-crypto-message-cipher",
  "mc-crypto-rand",
  "mc-ledger-db",
  "mc-sgx-compat",
- "mc-sgx-report-cache-api",
  "mc-sgx-slog",
  "mc-transaction-core",
  "mc-transaction-core-test-utils",
- "mc-util-build-script",
  "mc-util-from-random",
  "mc-util-serial",
  "prost",
  "rand 0.7.3",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
- "sha2 0.9.1",
+ "sha2",
 ]
 
 [[package]]
 name = "mc-consensus-enclave-measurement"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
  "mc-sgx-css",
@@ -2433,7 +2232,7 @@ dependencies = [
 
 [[package]]
 name = "mc-consensus-enclave-mock"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "mc-attest-core",
  "mc-attest-enclave-api",
@@ -2442,23 +2241,20 @@ dependencies = [
  "mc-crypto-digestible",
  "mc-crypto-keys",
  "mc-crypto-rand",
- "mc-sgx-report-cache-api",
  "mc-transaction-core",
  "mc-util-from-random",
  "mc-util-serial",
- "mockall",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
- "sha2 0.9.1",
+ "sha2",
 ]
 
 [[package]]
 name = "mc-consensus-scp"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "bigint",
  "crossbeam-channel 0.3.9",
- "maplit",
  "mc-common",
  "mc-crypto-digestible",
  "mc-crypto-keys",
@@ -2467,7 +2263,6 @@ dependencies = [
  "mc-util-metrics",
  "mc-util-serial",
  "mc-util-test-helper",
- "mockall",
  "pretty_assertions",
  "rand 0.7.3",
  "rand_hc 0.2.0",
@@ -2476,12 +2271,11 @@ dependencies = [
  "serial_test",
  "serial_test_derive",
  "sha3",
- "simplers_optimization",
 ]
 
 [[package]]
 name = "mc-consensus-scp-play"
-version = "0.6.0"
+version = "0.0.1"
 dependencies = [
  "mc-common",
  "mc-consensus-scp",
@@ -2495,7 +2289,7 @@ dependencies = [
 
 [[package]]
 name = "mc-consensus-service"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "base64 0.11.0",
  "cfg-if",
@@ -2503,7 +2297,7 @@ dependencies = [
  "curve25519-dalek",
  "failure",
  "fs_extra",
- "futures 0.3.5",
+ "futures",
  "grpcio",
  "hex 0.4.2",
  "lazy_static",
@@ -2511,6 +2305,7 @@ dependencies = [
  "mc-attest-core",
  "mc-attest-enclave-api",
  "mc-attest-net",
+ "mc-attest-untrusted",
  "mc-common",
  "mc-connection",
  "mc-consensus-api",
@@ -2523,7 +2318,7 @@ dependencies = [
  "mc-peers",
  "mc-peers-test-utils",
  "mc-sgx-build",
- "mc-sgx-report-cache-untrusted",
+ "mc-sgx-slog",
  "mc-sgx-urts",
  "mc-transaction-core",
  "mc-transaction-core-test-utils",
@@ -2536,7 +2331,7 @@ dependencies = [
  "mc-util-metrics",
  "mc-util-serial",
  "mc-util-uri",
- "mockall",
+ "prometheus",
  "prost",
  "protobuf",
  "rand 0.7.3",
@@ -2553,11 +2348,11 @@ dependencies = [
 
 [[package]]
 name = "mc-crypto-ake-enclave"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "aead",
  "aes-gcm",
- "digest 0.9.0",
+ "digest",
  "failure",
  "mc-attest-ake",
  "mc-attest-core",
@@ -2573,17 +2368,17 @@ dependencies = [
  "mc-util-serial",
  "rand_core 0.5.1",
  "serde",
- "sha2 0.9.1",
+ "sha2",
 ]
 
 [[package]]
 name = "mc-crypto-box"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "aead",
  "aes-gcm",
  "blake2",
- "digest 0.9.0",
+ "digest",
  "failure",
  "hkdf",
  "mc-crypto-keys",
@@ -2594,11 +2389,11 @@ dependencies = [
 
 [[package]]
 name = "mc-crypto-digestible"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cfg-if",
  "curve25519-dalek",
- "digest 0.9.0",
+ "digest",
  "ed25519-dalek",
  "mc-crypto-digestible-derive",
  "sha3",
@@ -2607,39 +2402,24 @@ dependencies = [
 
 [[package]]
 name = "mc-crypto-digestible-derive"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
+ "digest",
+ "generic-array 0.12.3",
+ "mc-crypto-digestible",
  "proc-macro2 1.0.12",
  "quote 1.0.4",
  "syn 1.0.18",
 ]
 
-[[package]]
-name = "mc-crypto-digestible-derive-test"
-version = "0.6.0"
-dependencies = [
- "digest 0.9.0",
- "generic-array 0.14.4",
- "mc-crypto-digestible",
- "mc-crypto-digestible-derive",
-]
-
-[[package]]
-name = "mc-crypto-hashes"
-version = "0.6.0"
-dependencies = [
- "blake2",
- "digest 0.9.0",
-]
-
 [[package]]
 name = "mc-crypto-keys"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "binascii",
  "cfg-if",
  "curve25519-dalek",
- "digest 0.9.0",
+ "digest",
  "ed25519",
  "ed25519-dalek",
  "failure",
@@ -2656,7 +2436,7 @@ dependencies = [
  "semver",
  "serde",
  "serde_json",
- "sha2 0.9.1",
+ "sha2",
  "signature",
  "tempdir",
  "x25519-dalek",
@@ -2665,27 +2445,27 @@ dependencies = [
 
 [[package]]
 name = "mc-crypto-message-cipher"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "aes-gcm",
  "failure",
- "generic-array 0.14.4",
+ "generic-array 0.12.3",
  "mc-util-serial",
  "mc-util-test-helper",
  "rand_core 0.5.1",
  "serde",
- "subtle 2.2.3",
+ "subtle 2.2.2",
 ]
 
 [[package]]
 name = "mc-crypto-noise"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "aead",
  "aes-gcm",
- "digest 0.9.0",
+ "digest",
  "failure",
- "generic-array 0.14.4",
+ "generic-array 0.12.3",
  "hkdf",
  "mc-crypto-keys",
  "mc-util-from-random",
@@ -2694,14 +2474,14 @@ dependencies = [
  "rand_hc 0.2.0",
  "secrecy",
  "serde",
- "sha2 0.9.1",
- "subtle 2.2.3",
+ "sha2",
+ "subtle 2.2.2",
  "zeroize 0.10.1",
 ]
 
 [[package]]
 name = "mc-crypto-rand"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cfg-if",
  "getrandom",
@@ -2710,23 +2490,9 @@ dependencies = [
  "rand_hc 0.2.0",
 ]
 
-[[package]]
-name = "mc-crypto-sig"
-version = "0.6.0"
-dependencies = [
- "mc-crypto-hashes",
- "mc-crypto-keys",
- "mc-util-from-random",
- "mc-util-test-helper",
- "merlin",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
- "schnorrkel",
-]
-
 [[package]]
 name = "mc-enclave-boundary"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "mc-common",
  "mc-crypto-rand",
@@ -2737,23 +2503,19 @@ dependencies = [
 
 [[package]]
 name = "mc-ledger-db"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "curve25519-dalek",
  "failure",
- "lazy_static",
- "lmdb-rkv",
- "mc-account-keys",
+ "lmdb",
  "mc-common",
  "mc-crypto-keys",
  "mc-crypto-rand",
  "mc-transaction-core",
  "mc-transaction-core-test-utils",
+ "mc-transaction-std",
  "mc-util-from-random",
- "mc-util-lmdb",
- "mc-util-metrics",
  "mc-util-serial",
- "mockall",
  "prost",
  "rand 0.7.3",
  "rand_core 0.5.1",
@@ -2763,7 +2525,7 @@ dependencies = [
 
 [[package]]
 name = "mc-ledger-distribution"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "dirs 2.0.2",
  "dotenv",
@@ -2784,7 +2546,7 @@ dependencies = [
 
 [[package]]
 name = "mc-ledger-from-archive"
-version = "0.6.0"
+version = "0.1.0"
 dependencies = [
  "mc-api",
  "mc-common",
@@ -2793,28 +2555,14 @@ dependencies = [
  "structopt",
 ]
 
-[[package]]
-name = "mc-ledger-migration"
-version = "0.6.0"
-dependencies = [
- "lmdb-rkv",
- "mc-common",
- "mc-ledger-db",
- "mc-util-lmdb",
- "mc-util-serial",
- "serde",
- "structopt",
-]
-
 [[package]]
 name = "mc-ledger-sync"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "crossbeam-channel 0.3.9",
  "failure",
  "grpcio",
  "lazy_static",
- "mc-account-keys",
  "mc-api",
  "mc-attest-core",
  "mc-common",
@@ -2841,17 +2589,16 @@ dependencies = [
 
 [[package]]
 name = "mc-mobilecoind"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
+ "byteorder",
  "crossbeam-channel 0.3.9",
  "failure",
- "futures 0.3.5",
+ "futures",
  "grpcio",
  "hex_fmt",
- "lmdb-rkv",
+ "lmdb",
  "lru",
- "mc-account-keys",
- "mc-api",
  "mc-attest-core",
  "mc-common",
  "mc-connection",
@@ -2871,7 +2618,6 @@ dependencies = [
  "mc-util-b58-payloads",
  "mc-util-from-random",
  "mc-util-grpc",
- "mc-util-lmdb",
  "mc-util-repr-bytes",
  "mc-util-serial",
  "mc-util-uri",
@@ -2891,45 +2637,25 @@ dependencies = [
 
 [[package]]
 name = "mc-mobilecoind-api"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
- "futures 0.3.5",
+ "futures",
  "grpcio",
  "hex_fmt",
  "mc-api",
  "mc-common",
  "mc-crypto-keys",
  "mc-transaction-core",
- "mc-transaction-std",
  "mc-util-build-grpc",
  "mc-util-build-script",
- "mc-util-uri",
  "protobuf",
  "rand 0.7.3",
 ]
 
-[[package]]
-name = "mc-mobilecoind-json"
-version = "0.6.0"
-dependencies = [
- "grpcio",
- "hex 0.4.2",
- "mc-api",
- "mc-common",
- "mc-mobilecoind-api",
- "mc-util-grpc",
- "protobuf",
- "rocket",
- "rocket_contrib",
- "serde",
- "serde_derive",
- "structopt",
-]
-
 [[package]]
 name = "mc-peers"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "crossbeam-channel 0.3.9",
  "ed25519",
@@ -2948,22 +2674,20 @@ dependencies = [
  "mc-ledger-db",
  "mc-peers-test-utils",
  "mc-transaction-core",
- "mc-util-grpc",
  "mc-util-serial",
  "mc-util-uri",
- "mockall",
  "protobuf",
  "rand 0.7.3",
  "rand_hc 0.2.0",
  "retry",
  "serde",
- "sha2 0.9.1",
+ "sha2",
  "url 2.1.1",
 ]
 
 [[package]]
 name = "mc-peers-test-utils"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "grpcio",
  "hex 0.4.2",
@@ -2981,19 +2705,19 @@ dependencies = [
  "rand 0.7.3",
  "rand_hc 0.2.0",
  "retry",
- "sha2 0.9.1",
+ "sha2",
 ]
 
 [[package]]
 name = "mc-sgx-backtrace-edl"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
 ]
 
 [[package]]
 name = "mc-sgx-build"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cc",
  "lazy_static",
@@ -3003,7 +2727,7 @@ dependencies = [
 
 [[package]]
 name = "mc-sgx-compat"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cfg-if",
  "mc-sgx-types",
@@ -3011,7 +2735,7 @@ dependencies = [
 
 [[package]]
 name = "mc-sgx-compat-edl"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
  "mc-sgx-debug-edl",
@@ -3020,25 +2744,22 @@ dependencies = [
 
 [[package]]
 name = "mc-sgx-core-types"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
- "base64 0.12.1",
+ "binascii",
  "bincode",
  "bitflags",
  "displaydoc",
- "hex 0.4.2",
  "hex_fmt",
  "mc-sgx-core-types-sys",
  "mc-util-encodings",
- "mc-util-repr-bytes",
- "prost",
  "serde",
- "subtle 2.2.3",
+ "subtle 2.2.2",
 ]
 
 [[package]]
 name = "mc-sgx-core-types-sys"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "bindgen",
  "cargo-emit",
@@ -3049,22 +2770,22 @@ dependencies = [
 
 [[package]]
 name = "mc-sgx-css"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "failure",
- "sha2 0.9.1",
+ "sha2",
 ]
 
 [[package]]
 name = "mc-sgx-debug-edl"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
 ]
 
 [[package]]
 name = "mc-sgx-epid"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "bitflags",
  "mc-sgx-core-types",
@@ -3075,7 +2796,7 @@ dependencies = [
 
 [[package]]
 name = "mc-sgx-epid-sys"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "bindgen",
  "cargo-emit",
@@ -3088,29 +2809,25 @@ dependencies = [
 
 [[package]]
 name = "mc-sgx-epid-types"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
- "base64 0.12.1",
+ "binascii",
  "bincode",
- "bytes 0.5.4",
- "hex 0.4.2",
  "hex_fmt",
  "mc-sgx-core-types",
  "mc-sgx-core-types-sys",
  "mc-sgx-epid-types-sys",
  "mc-util-encodings",
  "mc-util-from-random",
- "mc-util-repr-bytes",
- "prost",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
  "serde",
- "subtle 2.2.3",
+ "subtle 2.2.2",
 ]
 
 [[package]]
 name = "mc-sgx-epid-types-sys"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "bindgen",
  "cargo-emit",
@@ -3122,11 +2839,10 @@ dependencies = [
 
 [[package]]
 name = "mc-sgx-ias-types"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "base64 0.12.1",
  "bitflags",
- "bytes 0.5.4",
  "chrono",
  "displaydoc",
  "hex 0.4.2",
@@ -3138,90 +2854,60 @@ dependencies = [
  "mc-util-encodings",
  "mc-util-from-random",
  "mc-util-repr-bytes",
- "prost",
- "prost-types",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
  "rjson",
- "subtle 2.2.3",
+ "serde",
+ "subtle 2.2.2",
  "typenum",
 ]
 
 [[package]]
 name = "mc-sgx-libc-types"
-version = "0.6.0"
+version = "0.4.0"
 
 [[package]]
 name = "mc-sgx-panic-edl"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
 ]
 
-[[package]]
-name = "mc-sgx-report-cache-api"
-version = "0.6.0"
-dependencies = [
- "displaydoc",
- "mc-attest-core",
- "mc-attest-enclave-api",
- "mc-util-serial",
- "serde",
-]
-
-[[package]]
-name = "mc-sgx-report-cache-untrusted"
-version = "0.6.0"
-dependencies = [
- "displaydoc",
- "mc-attest-core",
- "mc-attest-enclave-api",
- "mc-attest-net",
- "mc-attest-untrusted",
- "mc-common",
- "mc-sgx-report-cache-api",
- "mc-util-metrics",
- "retry",
-]
-
 [[package]]
 name = "mc-sgx-slog"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cfg-if",
- "mc-common",
- "mc-sgx-build",
  "prost",
+ "slog",
+ "slog-scope",
 ]
 
 [[package]]
 name = "mc-sgx-slog-edl"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
 ]
 
 [[package]]
 name = "mc-sgx-types"
-version = "0.6.0"
+version = "0.4.0"
 
 [[package]]
 name = "mc-sgx-urts"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "lazy_static",
- "mc-common",
  "mc-sgx-build",
  "mc-sgx-libc-types",
- "mc-sgx-slog",
  "mc-sgx-types",
- "prost",
  "rustc-demangle",
 ]
 
 [[package]]
 name = "mc-sgx-urts-sys"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "bindgen",
  "cargo-emit",
@@ -3233,42 +2919,43 @@ dependencies = [
 
 [[package]]
 name = "mc-testnet-client"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "chrono",
  "dialoguer",
  "grpcio",
  "hex 0.4.2",
  "indicatif",
- "mc-api",
- "mc-common",
  "mc-mobilecoind-api",
  "mc-util-b58-payloads",
  "mc-util-grpc",
  "protobuf",
  "rust_decimal",
- "serde",
  "structopt",
 ]
 
 [[package]]
 name = "mc-transaction-core"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
+ "aead",
  "blake2",
+ "bs58",
  "bulletproofs",
+ "byteorder",
  "cfg-if",
+ "crc",
+ "criterion",
  "curve25519-dalek",
- "digest 0.9.0",
+ "digest",
  "failure",
- "generic-array 0.14.4",
+ "generic-array 0.12.3",
  "hex_fmt",
+ "hkdf",
  "lazy_static",
- "mc-account-keys",
  "mc-common",
  "mc-crypto-box",
  "mc-crypto-digestible",
- "mc-crypto-hashes",
  "mc-crypto-keys",
  "mc-crypto-rand",
  "mc-ledger-db",
@@ -3284,18 +2971,16 @@ dependencies = [
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
  "serde",
- "sha2 0.9.1",
- "subtle 2.2.3",
+ "sha2",
+ "subtle 2.2.2",
  "tempdir",
  "time",
- "zeroize 1.1.0",
 ]
 
 [[package]]
 name = "mc-transaction-core-test-utils"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
- "mc-account-keys",
  "mc-crypto-keys",
  "mc-crypto-rand",
  "mc-ledger-db",
@@ -3308,15 +2993,13 @@ dependencies = [
 
 [[package]]
 name = "mc-transaction-std"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "blake2",
  "curve25519-dalek",
  "failure",
  "hkdf",
- "mc-account-keys",
  "mc-common",
- "mc-crypto-hashes",
  "mc-crypto-keys",
  "mc-transaction-core",
  "mc-util-from-random",
@@ -3326,34 +3009,32 @@ dependencies = [
  "rand 0.7.3",
  "rand_core 0.5.1",
  "serde",
- "yaml-rust",
- "zeroize 1.1.0",
 ]
 
 [[package]]
 name = "mc-util-b58-payloads"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "bs58",
  "crc",
  "failure",
  "hex_fmt",
- "mc-account-keys",
  "mc-common",
  "mc-crypto-keys",
+ "mc-transaction-core",
+ "mc-transaction-std",
  "mc-util-serial",
  "mc-util-test-helper",
- "mc-util-uri",
  "rand 0.7.3",
 ]
 
 [[package]]
 name = "mc-util-build-bolt-signalapp"
-version = "0.6.0"
+version = "0.4.0"
 
 [[package]]
 name = "mc-util-build-enclave"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
  "cargo_metadata 0.9.1",
@@ -3369,7 +3050,7 @@ dependencies = [
 
 [[package]]
 name = "mc-util-build-grpc"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "mc-util-build-script",
  "protoc-grpcio",
@@ -3377,14 +3058,14 @@ dependencies = [
 
 [[package]]
 name = "mc-util-build-info"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "json",
 ]
 
 [[package]]
 name = "mc-util-build-script"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
  "failure",
@@ -3395,7 +3076,7 @@ dependencies = [
 
 [[package]]
 name = "mc-util-build-sgx"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "cargo-emit",
  "cc",
@@ -3407,30 +3088,26 @@ dependencies = [
 
 [[package]]
 name = "mc-util-encodings"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
- "base64 0.12.1",
  "binascii",
- "displaydoc",
- "hex 0.4.2",
- "mc-util-repr-bytes",
+ "failure",
  "serde",
 ]
 
 [[package]]
 name = "mc-util-from-random"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "rand_core 0.5.1",
 ]
 
 [[package]]
 name = "mc-util-generate-sample-ledger"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "curve25519-dalek",
  "hex 0.3.2",
- "mc-account-keys",
  "mc-crypto-keys",
  "mc-ledger-db",
  "mc-transaction-core",
@@ -3446,13 +3123,14 @@ dependencies = [
 
 [[package]]
 name = "mc-util-grpc"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
- "futures 0.3.5",
+ "futures",
  "grpcio",
  "hex_fmt",
  "lazy_static",
  "mc-common",
+ "mc-connection",
  "mc-util-build-grpc",
  "mc-util-build-info",
  "mc-util-metrics",
@@ -3466,38 +3144,27 @@ dependencies = [
 
 [[package]]
 name = "mc-util-host-cert"
-version = "0.6.0"
+version = "0.4.0"
 
 [[package]]
 name = "mc-util-keyfile"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
- "hex 0.4.2",
- "mc-account-keys",
+ "hex 0.3.2",
  "mc-crypto-rand",
- "mc-util-from-random",
+ "mc-transaction-core",
+ "mc-transaction-std",
  "mc-util-serial",
  "rand 0.7.3",
  "rand_hc 0.2.0",
- "serde",
  "serde_json",
  "structopt",
  "tempdir",
 ]
 
-[[package]]
-name = "mc-util-lmdb"
-version = "0.6.0"
-dependencies = [
- "displaydoc",
- "lmdb-rkv",
- "mc-util-serial",
- "prost",
-]
-
 [[package]]
 name = "mc-util-logger-macros"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "proc-macro2 0.4.30",
  "quote 0.6.13",
@@ -3506,7 +3173,7 @@ dependencies = [
 
 [[package]]
 name = "mc-util-metered-channel"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "chrono",
  "crossbeam-channel 0.3.9",
@@ -3514,6 +3181,7 @@ dependencies = [
  "lazy_static",
  "mc-common",
  "mc-util-metrics",
+ "prometheus",
  "protobuf",
  "reqwest",
  "serde_json",
@@ -3521,7 +3189,7 @@ dependencies = [
 
 [[package]]
 name = "mc-util-metrics"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "chrono",
  "crossbeam-channel 0.3.9",
@@ -3536,9 +3204,9 @@ dependencies = [
 
 [[package]]
 name = "mc-util-repr-bytes"
-version = "0.6.0"
+version = "0.1.0"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.13.2",
  "prost",
  "serde",
  "serde_cbor",
@@ -3546,7 +3214,7 @@ dependencies = [
 
 [[package]]
 name = "mc-util-serial"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "prost",
  "serde",
@@ -3555,13 +3223,14 @@ dependencies = [
 
 [[package]]
 name = "mc-util-test-helper"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
- "itertools",
+ "itertools 0.9.0",
  "lazy_static",
- "mc-account-keys",
  "mc-common",
  "mc-crypto-keys",
+ "mc-transaction-core",
+ "mc-transaction-std",
  "mc-util-serial",
  "rand 0.7.3",
  "rand_core 0.5.1",
@@ -3569,18 +3238,9 @@ dependencies = [
  "structopt",
 ]
 
-[[package]]
-name = "mc-util-test-vectors"
-version = "0.6.0"
-dependencies = [
- "datatest",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "mc-util-uri"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "base64 0.11.0",
  "displaydoc",
@@ -3596,32 +3256,12 @@ dependencies = [
  "url 2.1.1",
 ]
 
-[[package]]
-name = "mc-util-url-encoding"
-version = "0.6.0"
-dependencies = [
- "base64 0.11.0",
- "crc",
- "displaydoc",
- "hex 0.4.2",
- "mc-account-keys",
- "mc-common",
- "mc-crypto-keys",
- "mc-util-b58-payloads",
- "mc-util-from-random",
- "mc-util-test-helper",
- "mc-util-uri",
- "rand_hc 0.2.0",
- "url 2.1.1",
-]
-
 [[package]]
 name = "mc-watcher"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
  "failure",
- "lmdb-rkv",
- "mc-account-keys",
+ "lmdb",
  "mc-api",
  "mc-common",
  "mc-crypto-keys",
@@ -3630,10 +3270,7 @@ dependencies = [
  "mc-transaction-core",
  "mc-transaction-core-test-utils",
  "mc-util-from-random",
- "mc-util-lmdb",
  "mc-util-serial",
- "mc-util-test-helper",
- "mc-watcher-api",
  "prost",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
@@ -3642,14 +3279,6 @@ dependencies = [
  "url 2.1.1",
 ]
 
-[[package]]
-name = "mc-watcher-api"
-version = "0.6.0"
-dependencies = [
- "displaydoc",
- "serde",
-]
-
 [[package]]
 name = "md5"
 version = "0.7.0"
@@ -3794,30 +3423,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "mockall"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01458f8a19b10cb28195290942e3149161c75acf67ebc8fbf714ab67a2b943bc"
-dependencies = [
- "cfg-if",
- "downcast",
- "fragile",
- "lazy_static",
- "mockall_derive",
- "predicates",
- "predicates-tree",
-]
-
-[[package]]
-name = "mockall_derive"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a673cb441f78cd9af4f5919c28576a3cc325fb6b54e42f7047dacce3c718c17b"
+name = "mobilecoind-json"
+version = "0.1.0"
 dependencies = [
- "cfg-if",
- "proc-macro2 1.0.12",
- "quote 1.0.4",
- "syn 1.0.18",
+ "grpcio",
+ "hex 0.4.2",
+ "mc-api",
+ "mc-common",
+ "mc-mobilecoind-api",
+ "mc-util-grpc",
+ "protobuf",
+ "rocket",
+ "rocket_contrib",
+ "serde",
+ "serde_derive",
+ "structopt",
 ]
 
 [[package]]
@@ -3847,12 +3467,6 @@ dependencies = [
  "version_check 0.1.5",
 ]
 
-[[package]]
-name = "normalize-line-endings"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
-
 [[package]]
 name = "notify"
 version = "4.0.15"
@@ -3924,27 +3538,12 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
 [[package]]
 name = "openssl-probe"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 
-[[package]]
-name = "ordered-float"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "output_vt100"
 version = "0.1.2"
@@ -3970,20 +3569,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.6.2",
+ "parking_lot_core",
  "rustc_version",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.7.2",
-]
-
 [[package]]
 name = "parking_lot_core"
 version = "0.6.2"
@@ -3999,40 +3588,26 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
-[[package]]
-name = "parking_lot_core"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
-dependencies = [
- "cfg-if",
- "cloudabi",
- "libc",
- "redox_syscall",
- "smallvec 1.4.0",
- "winapi 0.3.8",
-]
-
 [[package]]
 name = "pear"
-version = "0.1.4"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5320f212db967792b67cfe12bd469d08afd6318a249bd917d5c19bc92200ab8a"
+checksum = "c26d2b92e47063ffce70d3e3b1bd097af121a9e0db07ca38a6cc1cf0cc85ff25"
 dependencies = [
  "pear_codegen",
 ]
 
 [[package]]
 name = "pear_codegen"
-version = "0.1.4"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfc1c836fdc3d1ef87c348b237b5b5c4dff922156fb2d968f57734f9669768ca"
+checksum = "336db4a192cc7f54efeb0c4e11a9245394824cc3bcbd37ba3ff51240c35d7a6e"
 dependencies = [
  "proc-macro2 0.4.30",
  "quote 0.6.13",
  "syn 0.15.44",
- "version_check 0.9.1",
- "yansi",
+ "version_check 0.1.5",
+ "yansi 0.4.0",
 ]
 
 [[package]]
@@ -4117,9 +3692,9 @@ dependencies = [
 
 [[package]]
 name = "polyval"
-version = "0.4.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9a50142b55ab3ed0e9f68dfb3709f1d90d29da24e91033f28b96330643107dc"
+checksum = "7ec3341498978de3bfd12d1b22f1af1de22818f5473a11e8a6ef997989e3a212"
 dependencies = [
  "cfg-if",
  "universal-hash",
@@ -4131,35 +3706,6 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 
-[[package]]
-name = "predicates"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96bfead12e90dccead362d62bb2c90a5f6fc4584963645bc7f71a735e0b0735a"
-dependencies = [
- "difference",
- "float-cmp",
- "normalize-line-endings",
- "predicates-core",
- "regex",
-]
-
-[[package]]
-name = "predicates-core"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178"
-
-[[package]]
-name = "predicates-tree"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124"
-dependencies = [
- "predicates-core",
- "treeline",
-]
-
 [[package]]
 name = "pretty_assertions"
 version = "0.6.1"
@@ -4172,15 +3718,6 @@ dependencies = [
  "output_vt100",
 ]
 
-[[package]]
-name = "priority-queue"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602c2e38842965277b124586dbc4691d83f37af5b4ecd7c9e46908e1bd7d5b35"
-dependencies = [
- "indexmap 0.4.1",
-]
-
 [[package]]
 name = "proc-macro-error"
 version = "1.0.2"
@@ -4239,16 +3776,16 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.9.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0ced56dee39a6e960c15c74dc48849d614586db2eaada6497477af7c7811cd"
+checksum = "5567486d5778e2c6455b1b90ff1c558f29e751fc018130fa182e15828e728af1"
 dependencies = [
  "cfg-if",
  "fnv",
  "lazy_static",
  "protobuf",
+ "quick-error",
  "spin",
- "thiserror",
 ]
 
 [[package]]
@@ -4274,7 +3811,7 @@ dependencies = [
 [[package]]
 name = "prost"
 version = "0.6.1"
-source = "git+https://github.com/danburkert/prost?rev=6113789f70b69709820becba4242824b4fb3ffec#6113789f70b69709820becba4242824b4fb3ffec"
+source = "git+https://github.com/mobilecoinofficial/prost?rev=4e1905329369ca7a1cac3eda978ee9379167ee95#4e1905329369ca7a1cac3eda978ee9379167ee95"
 dependencies = [
  "bytes 0.5.4",
  "prost-derive",
@@ -4283,25 +3820,15 @@ dependencies = [
 [[package]]
 name = "prost-derive"
 version = "0.6.1"
-source = "git+https://github.com/danburkert/prost?rev=6113789f70b69709820becba4242824b4fb3ffec#6113789f70b69709820becba4242824b4fb3ffec"
+source = "git+https://github.com/mobilecoinofficial/prost?rev=4e1905329369ca7a1cac3eda978ee9379167ee95#4e1905329369ca7a1cac3eda978ee9379167ee95"
 dependencies = [
  "anyhow",
- "itertools",
+ "itertools 0.8.2",
  "proc-macro2 1.0.12",
  "quote 1.0.4",
  "syn 1.0.18",
 ]
 
-[[package]]
-name = "prost-types"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa"
-dependencies = [
- "bytes 0.5.4",
- "prost",
-]
-
 [[package]]
 name = "protobuf"
 version = "2.14.0"
@@ -4328,9 +3855,9 @@ dependencies = [
 
 [[package]]
 name = "protoc-grpcio"
-version = "2.0.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af5d484461b7f14e103742f21014cc519f6f3711b05d50b3e86d912467a3f8b7"
+checksum = "a9798b534614b71d780778b1508410826073b5a1ca111a090f1f3fd3ac663ef6"
 dependencies = [
  "failure",
  "grpcio-compiler",
@@ -4699,12 +4226,12 @@ checksum = "5510dbde48c4c37bf69123b1f636b6dd5f8dffe1f4e358af03c46a4947dca219"
 
 [[package]]
 name = "rocket"
-version = "0.4.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6130967b369cfb8411b0b73e96fcba1229c32a9cc6f295d144f879bfced13c6e"
+checksum = "e20afbad214b001cabbe31dd270b48b3be980a7153ee2ed8392e241f856d651b"
 dependencies = [
  "atty",
- "base64 0.12.1",
+ "base64 0.10.1",
  "log 0.4.8",
  "memchr",
  "num_cpus",
@@ -4715,29 +4242,29 @@ dependencies = [
  "time",
  "toml 0.4.10",
  "version_check 0.9.1",
- "yansi",
+ "yansi 0.5.0",
 ]
 
 [[package]]
 name = "rocket_codegen"
-version = "0.4.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb852e6da168fb948a8f2b798ba2e2f0e4fc860eae0efa9cf2bf0f5466bb0425"
+checksum = "2108b35e2c3a35759d3f16cc3002ece05523191d884d3ad6523693fd43324dde"
 dependencies = [
  "devise",
  "glob 0.3.0",
- "indexmap 1.3.2",
+ "indexmap",
  "quote 0.6.13",
  "rocket_http",
  "version_check 0.9.1",
- "yansi",
+ "yansi 0.5.0",
 ]
 
 [[package]]
 name = "rocket_contrib"
-version = "0.4.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3946ca815127041d8f64455561031d058c22ae1b135251502c5ea523cf9e14b"
+checksum = "a10e7471279bc2d4a21b6fddd9589016bb119e6fbb547b216dd54ef237f28341"
 dependencies = [
  "log 0.4.8",
  "notify",
@@ -4748,13 +4275,13 @@ dependencies = [
 
 [[package]]
 name = "rocket_http"
-version = "0.4.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aff5a5480175f2f553a876b251e9350c74196128806d176da3a51c82aab5428"
+checksum = "6ce8ca76247376ea21cf271af0f95e3f2014596e3e4c7cc04e44ee6242a40ff2"
 dependencies = [
  "cookie",
  "hyper 0.10.16",
- "indexmap 1.3.2",
+ "indexmap",
  "pear",
  "percent-encoding 1.0.1",
  "smallvec 1.4.0",
@@ -4771,7 +4298,7 @@ checksum = "f1d1ecfe8dac29878a713fbc4c36b0a84a48f7a6883541841cdff9fdd2ba7dfb"
 dependencies = [
  "base64 0.11.0",
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures",
  "http 0.1.21",
  "hyper 0.12.35",
  "hyper-rustls 0.17.1",
@@ -4797,7 +4324,7 @@ checksum = "8632e41d289db90dd40d0389c71a23c5489e3afd448424226529113102e2a002"
 dependencies = [
  "chrono",
  "dirs 1.0.5",
- "futures 0.1.29",
+ "futures",
  "hyper 0.12.35",
  "lazy_static",
  "regex",
@@ -4816,7 +4343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fedcadf3d73c2925b05d547b66787f2219c5e727a98c893fff5cf2197dbd678"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures",
  "rusoto_core",
  "xml-rs",
 ]
@@ -4829,9 +4356,9 @@ checksum = "7063a70614eb4b36f49bcf4f6f6bb30cc765e3072b317d6afdfe51e7a9f482d1"
 dependencies = [
  "base64 0.11.0",
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures",
  "hex 0.4.2",
- "hmac 0.7.1",
+ "hmac",
  "http 0.1.21",
  "hyper 0.12.35",
  "log 0.4.8",
@@ -4840,7 +4367,7 @@ dependencies = [
  "rusoto_credential",
  "rustc_version",
  "serde",
- "sha2 0.8.1",
+ "sha2",
  "time",
  "tokio 0.1.22",
 ]
@@ -4970,21 +4497,6 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
-[[package]]
-name = "schnorrkel"
-version = "0.9.1"
-source = "git+https://github.com/w3f/schnorrkel?rev=cfdbe9ae865a4d3ffa2566d896d4dbedf5107028#cfdbe9ae865a4d3ffa2566d896d4dbedf5107028"
-dependencies = [
- "arrayref",
- "arrayvec",
- "curve25519-dalek",
- "merlin",
- "rand_core 0.5.1",
- "sha2 0.9.1",
- "subtle 2.2.3",
- "zeroize 1.1.0",
-]
-
 [[package]]
 name = "scoped_threadpool"
 version = "0.1.9"
@@ -5104,7 +4616,8 @@ dependencies = [
 [[package]]
 name = "serde_cbor"
 version = "0.11.1"
-source = "git+https://github.com/mobilecoinofficial/cbor?rev=4c886a7c1d523aae1ec4aa7386f402cb2f4341b5#4c886a7c1d523aae1ec4aa7386f402cb2f4341b5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
 dependencies = [
  "half",
  "serde",
@@ -5144,18 +4657,6 @@ dependencies = [
  "url 2.1.1",
 ]
 
-[[package]]
-name = "serde_yaml"
-version = "0.8.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
-dependencies = [
- "dtoa",
- "linked-hash-map",
- "serde",
- "yaml-rust",
-]
-
 [[package]]
 name = "serial_test"
 version = "0.1.0"
@@ -5181,24 +4682,10 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0"
 dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
+ "block-buffer",
+ "digest",
  "fake-simd",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "sha2"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpuid-bool",
- "digest 0.9.0",
- "libc",
- "opaque-debug 0.3.0",
+ "opaque-debug",
  "sha2-asm",
 ]
 
@@ -5213,14 +4700,15 @@ dependencies = [
 
 [[package]]
 name = "sha3"
-version = "0.9.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
+checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
 dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
+ "block-buffer",
+ "byte-tools",
+ "digest",
  "keccak",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -5241,22 +4729,11 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29f060a7d147e33490ec10da418795238fd7545bba241504d6b31a409f2e6210"
-dependencies = [
- "digest 0.9.0",
-]
-
-[[package]]
-name = "simplers_optimization"
-version = "0.4.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c98a40e020674655387c1631c55209274d6f3eb3a7a10a96c5c28c2afdc6c0cb"
+checksum = "685e1c5b65c6cc6fd0eb9ba63c6cfb8431f7f9c7e078c626f23f50e13fa378d7"
 dependencies = [
- "num-traits",
- "ordered-float",
- "priority-queue",
+ "digest",
 ]
 
 [[package]]
@@ -5299,8 +4776,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "slog"
-version = "2.6.0"
-source = "git+https://github.com/mobilecoinofficial/slog?rev=cc1562258b81353426d17a55b7447256fa6eabbf#cc1562258b81353426d17a55b7447256fa6eabbf"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cc9c640a4adbfbcc11ffb95efe5aa7af7309e002adab54b185507dbf2377b99"
 
 [[package]]
 name = "slog-async"
@@ -5488,9 +4966,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
 [[package]]
 name = "subtle"
-version = "2.2.3"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
+checksum = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941"
 
 [[package]]
 name = "syn"
@@ -5626,26 +5104,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "thiserror"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
-dependencies = [
- "proc-macro2 1.0.12",
- "quote 1.0.4",
- "syn 1.0.18",
-]
-
 [[package]]
 name = "thread_local"
 version = "1.0.1"
@@ -5682,7 +5140,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures",
  "mio",
  "num_cpus",
  "tokio-codec",
@@ -5725,7 +5183,7 @@ checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
 dependencies = [
  "bytes 0.4.12",
  "either",
- "futures 0.1.29",
+ "futures",
 ]
 
 [[package]]
@@ -5735,7 +5193,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures",
  "tokio-io",
 ]
 
@@ -5745,7 +5203,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
 dependencies = [
- "futures 0.1.29",
+ "futures",
  "tokio-executor",
 ]
 
@@ -5756,7 +5214,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
 dependencies = [
  "crossbeam-utils 0.7.2",
- "futures 0.1.29",
+ "futures",
 ]
 
 [[package]]
@@ -5765,7 +5223,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4"
 dependencies = [
- "futures 0.1.29",
+ "futures",
  "tokio-io",
  "tokio-threadpool",
 ]
@@ -5777,7 +5235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures",
  "log 0.4.8",
 ]
 
@@ -5788,7 +5246,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "382d90f43fa31caebe5d3bc6cfd854963394fff3b8cb59d5146607aaae7e7e43"
 dependencies = [
  "crossbeam-queue 0.1.2",
- "futures 0.1.29",
+ "futures",
  "lazy_static",
  "libc",
  "log 0.4.8",
@@ -5807,12 +5265,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
 dependencies = [
  "crossbeam-utils 0.7.2",
- "futures 0.1.29",
+ "futures",
  "lazy_static",
  "log 0.4.8",
  "mio",
  "num_cpus",
- "parking_lot 0.9.0",
+ "parking_lot",
  "slab",
  "tokio-executor",
  "tokio-io",
@@ -5826,7 +5284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d7cf08f990090abd6c6a73cab46fed62f85e8aef8b99e4b918a9f4a637f0676"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures",
  "iovec",
  "rustls 0.16.0",
  "tokio-io",
@@ -5851,7 +5309,7 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0c34c6e548f101053321cba3da7cbb87a610b85555884c41b07da2eb91aff12"
 dependencies = [
- "futures 0.1.29",
+ "futures",
  "libc",
  "mio",
  "mio-uds",
@@ -5869,7 +5327,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
 dependencies = [
  "fnv",
- "futures 0.1.29",
+ "futures",
 ]
 
 [[package]]
@@ -5879,7 +5337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures",
  "iovec",
  "mio",
  "tokio-io",
@@ -5895,7 +5353,7 @@ dependencies = [
  "crossbeam-deque",
  "crossbeam-queue 0.2.1",
  "crossbeam-utils 0.7.2",
- "futures 0.1.29",
+ "futures",
  "lazy_static",
  "log 0.4.8",
  "num_cpus",
@@ -5910,7 +5368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
 dependencies = [
  "crossbeam-utils 0.7.2",
- "futures 0.1.29",
+ "futures",
  "slab",
  "tokio-executor",
 ]
@@ -5922,7 +5380,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures",
  "log 0.4.8",
  "mio",
  "tokio-codec",
@@ -5937,7 +5395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5076db410d6fdc6523df7595447629099a1fdc47b3d9f896220780fa48faf798"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures",
  "iovec",
  "libc",
  "log 0.4.8",
@@ -5992,12 +5450,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
 
-[[package]]
-name = "treeline"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
-
 [[package]]
 name = "try-lock"
 version = "0.2.2"
@@ -6087,12 +5539,12 @@ checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 
 [[package]]
 name = "universal-hash"
-version = "0.4.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
+checksum = "df0c900f2f9b4116803415878ff48b63da9edb268668e08cf9292d7503114a01"
 dependencies = [
- "generic-array 0.14.4",
- "subtle 2.2.3",
+ "generic-array 0.12.3",
+ "subtle 2.2.2",
 ]
 
 [[package]]
@@ -6190,7 +5642,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
 dependencies = [
- "futures 0.1.29",
+ "futures",
  "log 0.4.8",
  "try-lock",
 ]
@@ -6399,9 +5851,9 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "1.0.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00ffb05621d7d051df0f020edf3e5db20797a4e522bf1f9c5dfa20603f1c85f6"
+checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217"
 dependencies = [
  "curve25519-dalek",
  "rand_core 0.5.1",
@@ -6415,13 +5867,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a"
 
 [[package]]
-name = "yaml-rust"
-version = "0.4.4"
+name = "yansi"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
-dependencies = [
- "linked-hash-map",
-]
+checksum = "d60c3b48c9cdec42fb06b3b84b5b087405e1fa1c644a1af3930e4dfafe93de48"
 
 [[package]]
 name = "yansi"