From 6d7327473966f13932f6c6892019c8a1743e461d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 23:57:22 +0000 Subject: [PATCH] build(deps): bump serde from 1.0.124 to 1.0.125 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.124 to 1.0.125. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.124...v1.0.125) Signed-off-by: dependabot[bot] --- Cargo.lock | 993 ++++++++---------- client/faucet/Cargo.toml | 13 +- client/json-rpc/Cargo.toml | 10 +- client/swiss-knife/Cargo.toml | 6 +- client/transaction-builder/Cargo.toml | 16 +- common/bitvec/Cargo.toml | 2 +- common/crash-handler/Cargo.toml | 2 +- common/diemdoc/Cargo.toml | 6 +- common/logger/Cargo.toml | 8 +- common/nibble/Cargo.toml | 2 +- common/short-hex-str/Cargo.toml | 4 +- common/trace/Cargo.toml | 10 +- common/workspace-hack/Cargo.toml | 88 +- config/Cargo.toml | 2 +- config/management/Cargo.toml | 4 +- config/management/genesis/Cargo.toml | 2 +- .../network-address-encryption/Cargo.toml | 2 +- config/management/operational/Cargo.toml | 6 +- consensus/Cargo.toml | 10 +- consensus/consensus-types/Cargo.toml | 2 +- consensus/safety-rules/Cargo.toml | 4 +- crypto/crypto/Cargo.toml | 19 +- devtools/x-core/Cargo.toml | 14 +- devtools/x-lint/Cargo.toml | 10 +- devtools/x/Cargo.toml | 14 +- execution/execution-correctness/Cargo.toml | 2 +- execution/executor-types/Cargo.toml | 2 +- execution/executor/Cargo.toml | 6 +- json-rpc/Cargo.toml | 16 +- json-rpc/types/Cargo.toml | 18 +- .../compiler/bytecode-source-map/Cargo.toml | 4 +- .../writeset-transaction-generator/Cargo.toml | 6 +- language/diem-vm/Cargo.toml | 6 +- language/move-core/types/Cargo.toml | 16 +- language/move-ir/types/Cargo.toml | 7 +- language/move-model/Cargo.toml | 7 +- language/move-prover/Cargo.toml | 15 +- language/move-prover/abigen/Cargo.toml | 3 +- .../move-prover/boogie-backend/Cargo.toml | 11 +- language/move-prover/bytecode/Cargo.toml | 9 +- language/move-prover/docgen/Cargo.toml | 8 +- language/move-prover/errmapgen/Cargo.toml | 3 +- language/move-vm/types/Cargo.toml | 4 +- language/tools/move-coverage/Cargo.toml | 4 +- language/tools/resource-viewer/Cargo.toml | 8 +- mempool/Cargo.toml | 11 +- network/Cargo.toml | 14 +- network/builder/Cargo.toml | 4 +- network/netcore/Cargo.toml | 6 +- sdk/client/Cargo.toml | 28 +- secure/key-manager/Cargo.toml | 8 +- secure/net/Cargo.toml | 4 +- secure/storage/Cargo.toml | 4 +- secure/storage/github/Cargo.toml | 4 +- secure/storage/vault/Cargo.toml | 6 +- state-sync/Cargo.toml | 9 +- storage/backup/backup-cli/Cargo.toml | 20 +- storage/backup/backup-service/Cargo.toml | 8 +- storage/diemdb/Cargo.toml | 6 +- storage/diemsum/Cargo.toml | 4 +- storage/jellyfish-merkle/Cargo.toml | 6 +- storage/storage-client/Cargo.toml | 2 +- storage/storage-interface/Cargo.toml | 2 +- testsuite/cli/Cargo.toml | 12 +- testsuite/cli/diem-wallet/Cargo.toml | 6 +- testsuite/cluster-test/Cargo.toml | 15 +- testsuite/generate-format/Cargo.toml | 2 +- types/Cargo.toml | 22 +- 68 files changed, 767 insertions(+), 840 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 01f07fd307c8..ab960085f4df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,6 +16,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", + "bytecode-verifier", "codespan-reporting", "datatest-stable", "diem-temppath", @@ -54,9 +55,9 @@ dependencies = [ [[package]] name = "adler" -version = "0.2.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" @@ -205,28 +206,28 @@ checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] name = "async-trait" -version = "0.1.42" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" +checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] name = "atomicwrites" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a2baf2feb820299c53c7ad1cc4f5914a220a1cb76d7ce321d2522a94b54651f" +checksum = "d4830ac690261d0b47f06e86d18c47eaa65d0184e576cf9b62c3a49b28cb876b" dependencies = [ - "nix 0.14.1", - "tempdir", + "nix", + "tempfile", "winapi 0.3.9", ] @@ -277,7 +278,7 @@ dependencies = [ "backup-service", "bcs", "byteorder", - "bytes 1.0.1", + "bytes", "diem-config", "diem-crypto", "diem-infallible", @@ -293,12 +294,12 @@ dependencies = [ "executor", "executor-test-helpers", "executor-types", - "futures 0.3.12", + "futures", "hex", "itertools 0.10.0", "num_cpus", "once_cell", - "pin-project 1.0.5", + "pin-project", "proptest", "rand 0.8.3", "regex", @@ -320,7 +321,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes 1.0.1", + "bytes", "diem-config", "diem-crypto", "diem-logger", @@ -329,7 +330,7 @@ dependencies = [ "diem-types", "diem-workspace-hack", "diemdb", - "futures 0.3.12", + "futures", "hyper", "once_cell", "reqwest", @@ -345,12 +346,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.0" @@ -359,9 +354,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "base64ct" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fb38fd6e62e4ceec8543db40ceb714454ff173451a0f2a6c8952fdf39a2d6c" +checksum = "7b8a45dc8036c7e52889226a96edacd45831c0dbdb8b803a58b8e0e12613b1a6" [[package]] name = "bcs" @@ -430,9 +425,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitvec" -version = "0.19.4" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" dependencies = [ "funty", "radium", @@ -460,7 +455,7 @@ dependencies = [ "block-padding 0.1.5", "byte-tools", "byteorder", - "generic-array 0.12.3", + "generic-array 0.12.4", ] [[package]] @@ -499,16 +494,15 @@ dependencies = [ "codespan-reporting", "datatest-stable", "diem-temppath", - "diem-types", "diem-workspace-hack", - "futures 0.3.12", + "futures", "handlebars", "itertools 0.10.0", "log", "move-core-types", "move-model", "move-prover-test-utils", - "num 0.3.1", + "num 0.4.0", "once_cell", "pretty", "rand 0.8.3", @@ -532,15 +526,15 @@ name = "bounded-executor" version = "0.1.0" dependencies = [ "diem-workspace-hack", - "futures 0.3.12", + "futures", "tokio", ] [[package]] name = "bstr" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf" +checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" dependencies = [ "lazy_static", "memchr", @@ -560,9 +554,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.4.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" [[package]] name = "byte-tools" @@ -589,8 +583,9 @@ dependencies = [ "move-core-types", "move-model", "move-prover-test-utils", - "num 0.3.1", + "num 0.4.0", "once_cell", + "petgraph", "serde", "serde_json", "vm", @@ -604,7 +599,6 @@ dependencies = [ "bcs", "codespan", "codespan-reporting", - "diem-types", "diem-workspace-hack", "move-core-types", "move-ir-types", @@ -618,7 +612,6 @@ version = "0.1.0" dependencies = [ "anyhow", "borrow-graph", - "diem-types", "diem-workspace-hack", "invalid-mutations", "mirai-annotations", @@ -633,7 +626,6 @@ version = "0.1.0" dependencies = [ "bytecode-verifier", "compiled-stdlib", - "diem-types", "diem-workspace-hack", "invalid-mutations", "move-core-types", @@ -644,15 +636,9 @@ dependencies = [ [[package]] name = "byteorder" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" - -[[package]] -name = "bytes" -version = "0.5.6" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" @@ -671,9 +657,9 @@ checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" [[package]] name = "camino" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176c40258709f5883ce0f352f30b2065c64112843b33e3e318e1c1cc22960979" +checksum = "2fb25ad5c4211e3c7abded8f00b480e6d1608845dcf14157e9e81d5432e9ac16" dependencies = [ "serde", ] @@ -689,10 +675,11 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.12.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f" +checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8" dependencies = [ + "camino", "cargo-platform", "semver 0.11.0", "semver-parser 0.10.2", @@ -763,7 +750,7 @@ dependencies = [ "diem-metrics", "diem-types", "diem-workspace-hack", - "futures 0.3.12", + "futures", "tokio", ] @@ -783,9 +770,9 @@ dependencies = [ [[package]] name = "chunked_transfer" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7477065d45a8fe57167bf3cf8bcd3729b54cfcb81cca49bda2d038ea89ae82ca" +checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" [[package]] name = "cipher" @@ -897,12 +884,13 @@ dependencies = [ "diem-types", "diem-workspace-hack", "flate2", - "futures 0.3.12", + "futures", "generate-key", "hex", "itertools 0.10.0", "k8s-openapi", "kube", + "move-core-types", "network", "network-builder", "num_cpus", @@ -999,9 +987,9 @@ dependencies = [ "bytecode-source-map", "bytecode-verifier", "compiled-stdlib", - "diem-types", "diem-workspace-hack", "ir-to-bytecode", + "move-core-types", "move-ir-types", "serde_json", "structopt 0.3.21", @@ -1016,7 +1004,7 @@ dependencies = [ "async-trait", "bcs", "byteorder", - "bytes 1.0.1", + "bytes", "channel", "consensus-types", "diem-config", @@ -1037,7 +1025,7 @@ dependencies = [ "executor-types", "fail", "fallible", - "futures 0.3.12", + "futures", "itertools 0.10.0", "mirai-annotations", "network", @@ -1202,7 +1190,7 @@ dependencies = [ "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", - "crossbeam-utils 0.8.2", + "crossbeam-utils", ] [[package]] @@ -1212,7 +1200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.2", + "crossbeam-utils", ] [[package]] @@ -1223,18 +1211,17 @@ checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", - "crossbeam-utils 0.8.2", + "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" +checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" dependencies = [ "cfg-if 1.0.0", - "const_fn", - "crossbeam-utils 0.8.2", + "crossbeam-utils", "lazy_static", "memoffset", "scopeguard", @@ -1247,30 +1234,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.2", + "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg 1.0.1", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae8f328835f8f5a6ceb6a7842a7f2d0c03692adb5c889347235d59194731fe3" +checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" dependencies = [ "autocfg 1.0.1", "cfg-if 1.0.0", "lazy_static", - "loom", ] [[package]] @@ -1291,9 +1266,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d58633299b24b515ac72a3f869f8b91306a3cec616a602843a383acd6f9e97" +checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" dependencies = [ "bstr", "csv-core", @@ -1326,7 +1301,7 @@ version = "3.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c15b8ec3b5755a188c141c1f6a98e76de31b936209bf066b647979e2a84764a9" dependencies = [ - "nix 0.20.0", + "nix", "winapi 0.3.9", ] @@ -1378,7 +1353,7 @@ name = "debug-interface" version = "0.1.0" dependencies = [ "anyhow", - "bytes 1.0.1", + "bytes", "diem-logger", "diem-metrics", "diem-workspace-hack", @@ -1389,9 +1364,9 @@ dependencies = [ [[package]] name = "determinator" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ec6ed6a28572d35f1c9d512fe0381b6bd83bf45e273b60b9c1df883234645c" +checksum = "7109a871b855b23d2b08d8e0cef5c005b9946b5bd4c77cc24e040a7b65717fb9" dependencies = [ "camino", "globset", @@ -1428,7 +1403,7 @@ dependencies = [ [[package]] name = "diem-client" -version = "0.1.0" +version = "0.0.1" dependencies = [ "anyhow", "bcs", @@ -1437,7 +1412,7 @@ dependencies = [ "diem-types", "diem-workspace-hack", "hex", - "proxy", + "ipnet", "reqwest", "serde", "serde_json", @@ -1471,14 +1446,14 @@ dependencies = [ [[package]] name = "diem-crypto" -version = "0.1.0" +version = "0.0.1" dependencies = [ "aes-gcm", "anyhow", "bcs", "bitvec", "byteorder", - "bytes 1.0.1", + "bytes", "criterion", "curve25519-dalek-fiat", "diem-crypto-derive", @@ -1509,13 +1484,13 @@ dependencies = [ [[package]] name = "diem-crypto-derive" -version = "0.1.0" +version = "0.0.1" dependencies = [ "anyhow", "diem-workspace-hack", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -1543,7 +1518,7 @@ dependencies = [ "diem-client", "diem-types", "diem-workspace-hack", - "futures 0.3.12", + "futures", "hex", "reqwest", "structopt 0.3.21", @@ -1561,11 +1536,13 @@ dependencies = [ "diem-crypto", "diem-infallible", "diem-logger", + "diem-transaction-builder", "diem-types", "diem-workspace-hack", "generate-key", "hex", "move-core-types", + "rand 0.8.3", "reqwest", "serde", "serde_derive", @@ -1573,7 +1550,6 @@ dependencies = [ "structopt 0.3.21", "tempfile", "tokio", - "transaction-builder-generated", "warp", ] @@ -1595,6 +1571,7 @@ dependencies = [ "log", "move-lang", "move-prover", + "move-stdlib", "rayon", "sha2", "transaction-builder-generator", @@ -1689,7 +1666,7 @@ dependencies = [ name = "diem-github-client" version = "0.1.0" dependencies = [ - "base64 0.13.0", + "base64", "diem-workspace-hack", "proxy", "serde", @@ -1719,12 +1696,14 @@ dependencies = [ "diem-crypto", "diem-crypto-derive", "diem-infallible", + "diem-metrics", "diem-nibble", "diem-types", "diem-workspace-hack", "mirai-annotations", "num-derive", "num-traits", + "once_cell", "proptest", "proptest-derive", "rand 0.8.3", @@ -1751,13 +1730,14 @@ dependencies = [ "diem-proptest-helpers", "diem-temppath", "diem-trace", + "diem-transaction-builder", "diem-types", "diem-workspace-hack", "diemdb", "executor", "executor-types", "fail", - "futures 0.3.12", + "futures", "generate-key", "hex", "hyper", @@ -1774,7 +1754,6 @@ dependencies = [ "serde_json", "storage-interface", "tokio", - "transaction-builder-generated", "vm-genesis", "vm-validator", "warp", @@ -1792,7 +1771,7 @@ dependencies = [ "diem-json-rpc-types", "diem-types", "diem-workspace-hack", - "futures 0.3.12", + "futures", "hex", "rand 0.8.3", "reqwest", @@ -1804,7 +1783,7 @@ dependencies = [ [[package]] name = "diem-json-rpc-types" -version = "0.1.0" +version = "0.0.1" dependencies = [ "anyhow", "bcs", @@ -1836,6 +1815,7 @@ dependencies = [ "diem-secure-push-metrics", "diem-secure-storage", "diem-time-service", + "diem-transaction-builder", "diem-types", "diem-vm", "diem-workspace-hack", @@ -1843,14 +1823,13 @@ dependencies = [ "executor", "executor-test-helpers", "executor-types", - "futures 0.3.12", + "futures", "once_cell", "rand 0.8.3", "serde", "storage-interface", "thiserror", "tokio", - "transaction-builder-generated", "vm-validator", ] @@ -1861,7 +1840,7 @@ dependencies = [ "diem-workspace-hack", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -1922,8 +1901,9 @@ dependencies = [ "diem-trace", "diem-types", "diem-workspace-hack", + "enum_dispatch", "fail", - "futures 0.3.12", + "futures", "itertools 0.10.0", "mirai-annotations", "netcore", @@ -1952,7 +1932,7 @@ dependencies = [ "diem-logger", "diem-metrics-core", "diem-workspace-hack", - "futures 0.3.12", + "futures", "hyper", "once_cell", "prometheus", @@ -1973,7 +1953,7 @@ dependencies = [ name = "diem-network-address-encryption" version = "0.1.0" dependencies = [ - "base64 0.13.0", + "base64", "bcs", "diem-global-constants", "diem-infallible", @@ -2021,7 +2001,7 @@ dependencies = [ "executor", "executor-types", "fail", - "futures 0.3.12", + "futures", "jemallocator", "network-builder", "state-sync", @@ -2078,8 +2058,8 @@ dependencies = [ "diem-logger", "diem-metrics", "diem-workspace-hack", - "futures 0.3.12", - "pin-project 1.0.5", + "futures", + "pin-project", "tokio", "tokio-util", ] @@ -2093,6 +2073,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "diem-sdk" +version = "0.0.1" +dependencies = [ + "diem-client", + "diem-crypto", + "diem-transaction-builder", + "diem-types", + "diem-workspace-hack", + "move-core-types", +] + [[package]] name = "diem-secure-net" version = "0.1.0" @@ -2120,7 +2112,7 @@ dependencies = [ name = "diem-secure-storage" version = "0.1.0" dependencies = [ - "base64 0.13.0", + "base64", "bcs", "chrono", "diem-crypto", @@ -2209,8 +2201,8 @@ dependencies = [ "diem-infallible", "diem-workspace-hack", "enum_dispatch", - "futures 0.3.12", - "pin-project 1.0.5", + "futures", + "pin-project", "thiserror", "tokio", "tokio-test", @@ -2233,6 +2225,20 @@ dependencies = [ "tokio", ] +[[package]] +name = "diem-transaction-builder" +version = "0.0.1" +dependencies = [ + "bcs", + "diem-types", + "diem-workspace-hack", + "move-core-types", + "once_cell", + "proptest", + "proptest-derive", + "serde", +] + [[package]] name = "diem-transaction-replay" version = "0.1.0" @@ -2262,12 +2268,12 @@ dependencies = [ [[package]] name = "diem-types" -version = "0.1.0" +version = "0.0.1" dependencies = [ "aes-gcm", "anyhow", "bcs", - "bytes 1.0.1", + "bytes", "chrono", "diem-crypto", "diem-crypto-derive", @@ -2309,7 +2315,7 @@ dependencies = [ name = "diem-vault-client" version = "0.1.0" dependencies = [ - "base64 0.13.0", + "base64", "chrono", "diem-crypto", "diem-proptest-helpers", @@ -2376,16 +2382,16 @@ name = "diem-workspace-hack" version = "0.1.0" dependencies = [ "byteorder", - "bytes 1.0.1", + "bytes", "cc", "chrono", "clap", "crossbeam-channel", "crossbeam-deque", - "crossbeam-utils 0.8.2", + "crossbeam-utils", "either", "fail", - "futures 0.3.12", + "futures", "futures-channel", "futures-core", "futures-io", @@ -2393,6 +2399,7 @@ dependencies = [ "futures-task", "futures-util", "hyper", + "indexmap", "itertools 0.10.0", "itoa", "libc", @@ -2406,6 +2413,8 @@ dependencies = [ "prost", "quote 0.6.13", "rand 0.8.3", + "regex", + "regex-syntax", "reqwest", "rusty-fork", "serde", @@ -2413,7 +2422,7 @@ dependencies = [ "standback", "subtle", "syn 0.15.44", - "syn 1.0.60", + "syn 1.0.64", "tokio", "tokio-util", "toml", @@ -2494,6 +2503,7 @@ dependencies = [ "anyhow", "byteorder", "diem-config", + "diem-jellyfish-merkle", "diem-types", "diem-workspace-hack", "diemdb", @@ -2549,7 +2559,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array 0.12.3", + "generic-array 0.12.4", ] [[package]] @@ -2561,6 +2571,15 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "dir-diff" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b" +dependencies = [ + "walkdir", +] + [[package]] name = "dirs" version = "1.0.5" @@ -2568,7 +2587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" dependencies = [ "libc", - "redox_users", + "redox_users 0.3.5", "winapi 0.3.9", ] @@ -2584,12 +2603,12 @@ dependencies = [ [[package]] name = "dirs-sys-next" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99de365f605554ae33f115102a02057d4fc18b01f3284d6870be0938743cfe7d" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users", + "redox_users 0.4.0", "winapi 0.3.9", ] @@ -2632,7 +2651,7 @@ dependencies = [ "move-model", "move-prover", "move-prover-test-utils", - "num 0.3.1", + "num 0.4.0", "once_cell", "regex", "serde", @@ -2683,13 +2702,19 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.26" +version = "0.8.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283" +checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + [[package]] name = "enum_dispatch" version = "0.3.5" @@ -2699,7 +2724,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -2722,7 +2747,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" dependencies = [ "atty", - "humantime 2.0.1", + "humantime 2.1.0", "log", "regex", "termcolor", @@ -2745,7 +2770,6 @@ dependencies = [ "bcs", "codespan-reporting", "datatest-stable", - "diem-types", "diem-workspace-hack", "log", "move-core-types", @@ -2958,9 +2982,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" dependencies = [ "matches", "percent-encoding", @@ -3024,12 +3048,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" -[[package]] -name = "futures" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed" - [[package]] name = "futures" version = "0.3.12" @@ -3087,7 +3105,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -3163,24 +3181,11 @@ dependencies = [ "rand 0.8.3", ] -[[package]] -name = "generator" -version = "0.6.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fed24fd1e18827652b4d55652899a1e9da8e54d91624dc3437a5bc3a9f9a9c" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "winapi 0.3.9", -] - [[package]] name = "generic-array" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" dependencies = [ "typenum", ] @@ -3233,11 +3238,11 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -3300,9 +3305,9 @@ dependencies = [ [[package]] name = "guppy" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4cbddce827d660864974dc3dc62a1c810e813d17e518cc5830716b977cd110" +checksum = "0fa0124762cfff525d695e75a173dc65dda372227a9daf949a1e24235e1b8632" dependencies = [ "camino", "cargo_metadata", @@ -3338,11 +3343,11 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b67e66362108efccd8ac053abafc8b7a8d86a37e6e48fc4f6f7485eb5e9e6a5" +checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78" dependencies = [ - "bytes 1.0.1", + "bytes", "fnv", "futures-core", "futures-sink", @@ -3353,14 +3358,13 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "tracing-futures", ] [[package]] name = "hakari" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136693d8798c61025d90e5c1f588eeec33e52d0e8d42f8a24ac2d79c590757ca" +checksum = "13e34ed149a6cc2125b0f4813211f658afcc49afdc7b276330f42d5256c3d9d8" dependencies = [ "atomicwrites", "camino", @@ -3376,9 +3380,9 @@ dependencies = [ [[package]] name = "half" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177" +checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" [[package]] name = "handlebars" @@ -3402,17 +3406,17 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" [[package]] name = "headers" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f" +checksum = "f0b7591fb62902706ae8e7aaff416b1b0fa2c0fd0878b46dc13baa3712d8a855" dependencies = [ - "base64 0.12.3", + "base64", "bitflags", - "bytes 0.5.6", + "bytes", "headers-core", "http", "mime", - "sha-1 0.8.2", + "sha-1 0.9.4", "time 0.1.44", ] @@ -3436,18 +3440,18 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" dependencies = [ "libc", ] [[package]] name = "hex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" @@ -3482,11 +3486,11 @@ dependencies = [ [[package]] name = "http" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26" +checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747" dependencies = [ - "bytes 0.5.6", + "bytes", "fnv", "itoa", ] @@ -3497,15 +3501,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994" dependencies = [ - "bytes 1.0.1", + "bytes", "http", ] [[package]] name = "httparse" -version = "1.3.4" +version = "1.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691" [[package]] name = "httpdate" @@ -3524,9 +3528,9 @@ dependencies = [ [[package]] name = "humantime" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" @@ -3534,7 +3538,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" dependencies = [ - "bytes 1.0.1", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -3544,7 +3548,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project 1.0.5", + "pin-project", "socket2", "tokio", "tower-service", @@ -3570,7 +3574,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.0.1", + "bytes", "hyper", "native-tls", "tokio", @@ -3579,9 +3583,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" dependencies = [ "matches", "unicode-bidi", @@ -3609,14 +3613,14 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] name = "indexmap" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" +checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" dependencies = [ "autocfg 1.0.1", "hashbrown", @@ -3649,7 +3653,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413" dependencies = [ - "bytes 1.0.1", + "bytes", ] [[package]] @@ -3666,8 +3670,8 @@ name = "invalid-mutations" version = "0.1.0" dependencies = [ "diem-proptest-helpers", - "diem-types", "diem-workspace-hack", + "move-core-types", "proptest", "vm", ] @@ -3703,7 +3707,6 @@ dependencies = [ "bytecode-source-map", "codespan", "codespan-reporting", - "diem-types", "diem-workspace-hack", "ir-to-bytecode-syntax", "log", @@ -3720,7 +3723,6 @@ version = "0.1.0" dependencies = [ "anyhow", "codespan", - "diem-types", "diem-workspace-hack", "hex", "move-core-types", @@ -3801,9 +3803,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.46" +version = "0.3.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" +checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78" dependencies = [ "wasm-bindgen", ] @@ -3827,8 +3829,8 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcc1f973542059e6d5a6d63de6a9539d0ec784f82b2327f3c1915d33200bc6a4" dependencies = [ - "base64 0.13.0", - "bytes 1.0.1", + "base64", + "bytes", "chrono", "serde", "serde-value", @@ -3843,17 +3845,17 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" [[package]] name = "kube" -version = "0.50.1" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ce7a69993c5da7c4ed2d5d61fe980a995a249a8155385a01aa963653f8af7f" +checksum = "8d47a55e9f881dc5027dcaf026670fa24b41f67926ab6517e2155488fe9c012a" dependencies = [ "Inflector", - "base64 0.13.0", - "bytes 1.0.1", + "base64", + "bytes", "chrono", "dirs-next", "either", - "futures 0.3.12", + "futures", "http", "hyper", "hyper-timeout", @@ -3863,7 +3865,7 @@ dependencies = [ "log", "openssl", "pem", - "pin-project 1.0.5", + "pin-project", "serde", "serde_json", "serde_yaml", @@ -3891,6 +3893,7 @@ dependencies = [ "language-e2e-tests", "move-core-types", "move-lang", + "move-stdlib", "move-vm-runtime", "move-vm-types", "once_cell", @@ -3922,6 +3925,7 @@ dependencies = [ "proptest", "proptest-derive", "rand 0.8.3", + "transaction-builder", "vm", "vm-genesis", ] @@ -3936,6 +3940,7 @@ dependencies = [ "compiler", "diem-crypto", "diem-logger", + "diem-transaction-builder", "diem-types", "diem-vm", "diem-workspace-hack", @@ -3947,7 +3952,6 @@ dependencies = [ "proptest", "serde_json", "transaction-builder", - "transaction-builder-generated", "vm", ] @@ -3965,9 +3969,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.86" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" +checksum = "538c092e5586f4cdd7dd8078c4a79220e3e168880218124dcbce860f0ea938c6" [[package]] name = "libfuzzer-sys" @@ -4003,9 +4007,9 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" +checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" @@ -4026,24 +4030,13 @@ dependencies = [ "serde", ] -[[package]] -name = "loom" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d44c73b4636e497b4917eb21c33539efa3816741a2d3ff26c6316f1b529481a4" -dependencies = [ - "cfg-if 1.0.0", - "generator", - "scoped-tls", -] - [[package]] name = "many-keys-stress-test" version = "0.1.0" dependencies = [ "channel", "diem-workspace-hack", - "futures 0.3.12", + "futures", "structopt 0.3.21", ] @@ -4090,10 +4083,10 @@ dependencies = [ name = "memsocket" version = "0.1.0" dependencies = [ - "bytes 1.0.1", + "bytes", "diem-infallible", "diem-workspace-hack", - "futures 0.3.12", + "futures", "once_cell", ] @@ -4115,9 +4108,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", "autocfg 1.0.1", @@ -4125,9 +4118,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.7" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7" +checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a" dependencies = [ "libc", "log", @@ -4216,7 +4209,7 @@ dependencies = [ [[package]] name = "move-core-types" -version = "0.1.0" +version = "0.0.1" dependencies = [ "anyhow", "bcs", @@ -4232,7 +4225,6 @@ dependencies = [ "serde", "serde_bytes", "serde_json", - "thiserror", ] [[package]] @@ -4274,7 +4266,6 @@ version = "0.1.0" dependencies = [ "anyhow", "codespan", - "diem-types", "diem-workspace-hack", "hex", "move-core-types", @@ -4294,7 +4285,7 @@ dependencies = [ "codespan", "codespan-reporting", "datatest-stable", - "diem-types", + "diem-framework", "diem-workspace-hack", "difference", "fallible", @@ -4303,6 +4294,8 @@ dependencies = [ "move-core-types", "move-ir-types", "move-lang-test-utils", + "move-stdlib", + "once_cell", "petgraph", "regex", "structopt 0.3.21", @@ -4317,10 +4310,12 @@ version = "0.1.0" dependencies = [ "anyhow", "datatest-stable", + "diem-framework", "diem-types", "diem-workspace-hack", "functional-tests", "move-lang", + "once_cell", "tempfile", ] @@ -4353,7 +4348,6 @@ dependencies = [ "codespan", "codespan-reporting", "datatest-stable", - "diem-types", "diem-workspace-hack", "itertools 0.10.0", "log", @@ -4361,7 +4355,7 @@ dependencies = [ "move-ir-types", "move-lang", "move-prover-test-utils", - "num 0.3.1", + "num 0.4.0", "once_cell", "regex", "serde", @@ -4383,11 +4377,10 @@ dependencies = [ "codespan-reporting", "datatest-stable", "diem-temppath", - "diem-types", "diem-workspace-hack", "docgen", "errmapgen", - "futures 0.3.12", + "futures", "handlebars", "hex", "itertools 0.10.0", @@ -4396,7 +4389,7 @@ dependencies = [ "move-lang", "move-model", "move-prover-test-utils", - "num 0.3.1", + "num 0.4.0", "once_cell", "pretty", "rand 0.8.3", @@ -4420,6 +4413,19 @@ dependencies = [ "regex", ] +[[package]] +name = "move-stdlib" +version = "0.1.0" +dependencies = [ + "diem-workspace-hack", + "dir-diff", + "docgen", + "log", + "move-prover", + "tempfile", + "walkdir", +] + [[package]] name = "move-vm-integration-tests" version = "0.1.0" @@ -4510,9 +4516,9 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" [[package]] name = "multipart" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8209c33c951f07387a8497841122fc6f712165e3f9bda3e6be4645b58188f676" +checksum = "d050aeedc89243f5347c3e237e3e13dc76fbe4ae3742a57b94dc14f69acf76d4" dependencies = [ "buf_redux", "httparse", @@ -4520,7 +4526,7 @@ dependencies = [ "mime", "mime_guess", "quick-error 1.2.3", - "rand 0.6.5", + "rand 0.7.3", "safemem", "tempfile", "twoway", @@ -4554,13 +4560,13 @@ checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e" name = "netcore" version = "0.1.0" dependencies = [ - "bytes 1.0.1", + "bytes", "diem-logger", "diem-types", "diem-workspace-hack", - "futures 0.3.12", + "futures", "memsocket", - "pin-project 1.0.5", + "pin-project", "proxy", "serde", "tokio", @@ -4574,7 +4580,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes 1.0.1", + "bytes", "channel", "criterion", "diem-bitvec", @@ -4589,7 +4595,7 @@ dependencies = [ "diem-time-service", "diem-types", "diem-workspace-hack", - "futures 0.3.12", + "futures", "futures-util", "hex", "maplit", @@ -4598,7 +4604,7 @@ dependencies = [ "network-builder", "num-variants", "once_cell", - "pin-project 1.0.5", + "pin-project", "proptest", "proptest-derive", "rand 0.8.3", @@ -4631,7 +4637,7 @@ dependencies = [ "diem-time-service", "diem-types", "diem-workspace-hack", - "futures 0.3.12", + "futures", "netcore", "network", "network-simple-onchain-discovery", @@ -4655,7 +4661,7 @@ dependencies = [ "diem-network-address-encryption", "diem-types", "diem-workspace-hack", - "futures 0.3.12", + "futures", "move-core-types", "netcore", "network", @@ -4667,28 +4673,12 @@ dependencies = [ ] [[package]] -name = "nix" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" -dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", - "libc", - "void", -] - -[[package]] -name = "nix" -version = "0.19.0" +name = "nibble_vec" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85db2feff6bf70ebc3a4793191517d5f0331100a2f10f9bf93b5e5214f32b7b7" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", - "libc", + "smallvec", ] [[package]] @@ -4738,15 +4728,15 @@ dependencies = [ [[package]] name = "num" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" +checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" dependencies = [ - "num-bigint 0.3.1", - "num-complex 0.3.1", + "num-bigint 0.4.0", + "num-complex 0.4.0", "num-integer", "num-iter", - "num-rational 0.3.2", + "num-rational 0.4.0", "num-traits", ] @@ -4763,9 +4753,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" +checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512" dependencies = [ "autocfg 1.0.1", "num-integer", @@ -4784,9 +4774,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" +checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" dependencies = [ "num-traits", ] @@ -4799,7 +4789,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -4837,12 +4827,12 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" dependencies = [ "autocfg 1.0.1", - "num-bigint 0.3.1", + "num-bigint 0.4.0", "num-integer", "num-traits", ] @@ -4863,7 +4853,7 @@ dependencies = [ "diem-workspace-hack", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -4896,9 +4886,9 @@ checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" [[package]] name = "once_cell" -version = "1.7.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10acf907b94fc1b1a152d08ef97e7759650268cf986bf127f387e602b02c7e5a" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "oorandom" @@ -4953,9 +4943,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dacdec97876ef3ede8c50efc429220641a0b11ba0048b4b0c357bccbc47c5204" +checksum = "766f840da25490628d8e63e529cd21c014f6600c6b8517add12a6fa6167a6218" dependencies = [ "num-traits", ] @@ -4973,14 +4963,14 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.1.57", + "redox_syscall 0.2.5", "smallvec", "winapi 0.3.9", ] @@ -5022,11 +5012,11 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c220d01f863d13d96ca82359d1e81e64a7c6bf0637bcde7b2349630addf0c6" +checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" dependencies = [ - "base64 0.13.0", + "base64", "once_cell", "regex", ] @@ -5066,7 +5056,7 @@ dependencies = [ "pest_meta", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -5090,33 +5080,13 @@ dependencies = [ "indexmap", ] -[[package]] -name = "pin-project" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" -dependencies = [ - "pin-project-internal 0.4.27", -] - [[package]] name = "pin-project" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63" dependencies = [ - "pin-project-internal 1.0.5", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" -dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.60", + "pin-project-internal", ] [[package]] @@ -5127,14 +5097,14 @@ checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] name = "pin-project-lite" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" [[package]] name = "pin-utils" @@ -5237,7 +5207,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", "version_check", ] @@ -5260,9 +5230,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" @@ -5284,15 +5254,15 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8425533e7122f0c3cc7a37e6244b16ad3a2cc32ae7ac6276e2a75da0d9c200d" +checksum = "5986aa8d62380092d2f50f8b1cdba9cb9b6731ffd4b25b51fd126b6c3e05b99c" dependencies = [ "cfg-if 1.0.0", "fnv", "lazy_static", + "memchr", "parking_lot", - "regex", "thiserror", ] @@ -5333,7 +5303,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" dependencies = [ - "bytes 1.0.1", + "bytes", "prost-derive", ] @@ -5343,7 +5313,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" dependencies = [ - "bytes 1.0.1", + "bytes", "heck", "itertools 0.9.0", "log", @@ -5365,7 +5335,7 @@ dependencies = [ "itertools 0.9.0", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -5374,7 +5344,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" dependencies = [ - "bytes 1.0.1", + "bytes", "prost", ] @@ -5432,16 +5402,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] -name = "rand" -version = "0.4.6" +name = "radix_trie" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi 0.3.9", + "endian-type", + "nibble_vec", ] [[package]] @@ -5469,7 +5436,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom 0.1.15", + "getrandom 0.1.16", "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", @@ -5539,7 +5506,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom 0.1.15", + "getrandom 0.1.16", ] [[package]] @@ -5660,7 +5627,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ "crossbeam-channel", "crossbeam-deque", - "crossbeam-utils 0.8.2", + "crossbeam-utils", "lazy_static", "num_cpus", ] @@ -5682,20 +5649,20 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" +checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" dependencies = [ "bitflags", ] [[package]] name = "redox_termios" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" +checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" dependencies = [ - "redox_syscall 0.1.57", + "redox_syscall 0.2.5", ] [[package]] @@ -5704,11 +5671,21 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ - "getrandom 0.1.15", + "getrandom 0.1.16", "redox_syscall 0.1.57", "rust-argon2", ] +[[package]] +name = "redox_users" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +dependencies = [ + "getrandom 0.2.2", + "redox_syscall 0.2.5", +] + [[package]] name = "ref-cast" version = "1.0.6" @@ -5726,7 +5703,7 @@ checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -5752,9 +5729,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.22" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" +checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" [[package]] name = "remove_dir_all" @@ -5783,17 +5760,17 @@ checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] name = "reqwest" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0460542b551950620a3648c6aa23318ac6b3cd779114bd873209e6e8b5eb1c34" +checksum = "bf12057f289428dbf5c591c74bf10392e4a8003f993405a902f20117019022d4" dependencies = [ - "base64 0.13.0", - "bytes 1.0.1", + "base64", + "bytes", "encoding_rs", "futures-core", "futures-util", @@ -5843,9 +5820,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.19" +version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "024a1e66fea74c66c66624ee5622a7ff0e4b73a13b4f5c326ddb50c708944226" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", "libc", @@ -5884,8 +5861,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7645ce7ec0d2a2f0e2ffdd3f6e04901f70fb396e4d1767b883ebc7361dbf310" dependencies = [ "async-trait", - "bytes 1.0.1", - "futures 0.3.12", + "bytes", + "futures", "rusoto_core", "serde_urlencoded 0.6.1", "xml-rs", @@ -5898,10 +5875,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02aff20978970d47630f08de5f0d04799497818d16cafee5aec90c4b4d0806cf" dependencies = [ "async-trait", - "base64 0.13.0", - "bytes 1.0.1", + "base64", + "bytes", "crc32fast", - "futures 0.3.12", + "futures", "http", "hyper", "hyper-tls", @@ -5925,7 +5902,7 @@ dependencies = [ "async-trait", "chrono", "dirs-next", - "futures 0.3.12", + "futures", "hyper", "serde", "serde_json", @@ -5941,8 +5918,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abc3f56f14ccf91f880b9a9c2d0556d8523e8c155041c54db155b384a1dd1119" dependencies = [ "async-trait", - "bytes 1.0.1", - "futures 0.3.12", + "bytes", + "futures", "rusoto_core", "xml-rs", ] @@ -5953,9 +5930,9 @@ version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5486e6b1673ab3e0ba1ded284fb444845fe1b7f41d13989a54dd60f62a7b2baa" dependencies = [ - "base64 0.13.0", - "bytes 1.0.1", - "futures 0.3.12", + "base64", + "bytes", + "futures", "hex", "hmac", "http", @@ -5968,7 +5945,7 @@ dependencies = [ "rustc_version", "serde", "sha2", - "time 0.2.23", + "time 0.2.25", "tokio", ] @@ -5979,9 +5956,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f93005e0c3b9e40a424b50ca71886d2445cc19bb6cdac3ac84c2daff482eb59" dependencies = [ "async-trait", - "bytes 1.0.1", + "bytes", "chrono", - "futures 0.3.12", + "futures", "rusoto_core", "serde_urlencoded 0.6.1", "xml-rs", @@ -5989,14 +5966,14 @@ dependencies = [ [[package]] name = "rust-argon2" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ - "base64 0.12.3", + "base64", "blake2b_simd", "constant_time_eq", - "crossbeam-utils 0.7.2", + "crossbeam-utils", ] [[package]] @@ -6037,19 +6014,13 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b" dependencies = [ - "base64 0.13.0", + "base64", "log", "ring", "sct", "webpki", ] -[[package]] -name = "rustversion" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" - [[package]] name = "rusty-fork" version = "0.3.0" @@ -6064,9 +6035,9 @@ dependencies = [ [[package]] name = "rustyline" -version = "7.1.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8227301bfc717136f0ecbd3d064ba8199e44497a0bdd46bb01ede4387cfd2cec" +checksum = "b9e1b597fcd1eeb1d6b25b493538e5aa19629eb08932184b85fef931ba87e893" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -6075,8 +6046,10 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.19.0", + "nix", + "radix_trie", "scopeguard", + "smallvec", "unicode-segmentation", "unicode-width", "utf8parse", @@ -6158,7 +6131,6 @@ dependencies = [ "once_cell", "proptest", "rocksdb", - "tempfile", ] [[package]] @@ -6177,6 +6149,7 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" name = "scratchpad" version = "0.1.0" dependencies = [ + "arc-swap", "diem-crypto", "diem-infallible", "diem-types", @@ -6197,9 +6170,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.0.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69" +checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d" dependencies = [ "bitflags", "core-foundation", @@ -6210,9 +6183,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b" +checksum = "dee48cdde5ed250b0d3252818f646e174ab414036edb884dde62d80a3ac6082d" dependencies = [ "core-foundation-sys", "libc", @@ -6274,18 +6247,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.123" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" dependencies = [ "serde_derive", ] [[package]] name = "serde-generate" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0f85376837e3205327f904948a0dd369a132d63faa645ffc5925b7479daa13" +checksum = "b53e80288353f538b8a6aff447ce08fd59b81f3e56ca4c45326e6585155188ce" dependencies = [ "bcs", "bincode", @@ -6297,7 +6270,7 @@ dependencies = [ "serde_bytes", "serde_yaml", "structopt 0.3.21", - "textwrap 0.12.1", + "textwrap 0.13.4", ] [[package]] @@ -6351,20 +6324,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.123" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] name = "serde_json" -version = "1.0.62" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "indexmap", "itoa", @@ -6427,7 +6400,7 @@ checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -6561,9 +6534,9 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "smawk" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bc737c97d093feb72e67f4926d9b22d717ce8580cd25f0ce86d74e859c466d" +checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" [[package]] name = "smoke-test" @@ -6579,6 +6552,7 @@ dependencies = [ "diem-config", "diem-crypto", "diem-events-fetcher", + "diem-framework", "diem-genesis-tool", "diem-global-constants", "diem-infallible", @@ -6601,7 +6575,8 @@ dependencies = [ "diem-writeset-generator", "generate-key", "hex", - "num 0.3.1", + "move-stdlib", + "num 0.4.0", "num-traits", "once_cell", "rand 0.8.3", @@ -6622,7 +6597,7 @@ dependencies = [ "diem-logger", "diem-types", "diem-workspace-hack", - "futures 0.3.12", + "futures", "memsocket", "netcore", "network", @@ -6668,9 +6643,8 @@ dependencies = [ name = "state-sync" version = "0.1.0" dependencies = [ - "anyhow", "bcs", - "bytes 1.0.1", + "bytes", "channel", "compiled-stdlib", "diem-config", @@ -6691,7 +6665,7 @@ dependencies = [ "executor-test-helpers", "executor-types", "fail", - "futures 0.3.12", + "futures", "itertools 0.10.0", "memsocket", "netcore", @@ -6757,7 +6731,7 @@ dependencies = [ "quote 1.0.9", "serde", "serde_derive", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -6773,7 +6747,7 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -6832,7 +6806,7 @@ dependencies = [ "diem-types", "diem-workspace-hack", "diemdb", - "futures 0.3.12", + "futures", "itertools 0.10.0", "proptest", "rand 0.8.3", @@ -6890,7 +6864,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -6945,9 +6919,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.60" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", @@ -6962,15 +6936,15 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", "unicode-xid 0.2.1", ] [[package]] name = "tap" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-spec" @@ -6982,16 +6956,6 @@ dependencies = [ "serde", ] -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] - [[package]] name = "tempfile" version = "3.2.0" @@ -7001,7 +6965,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "rand 0.8.3", - "redox_syscall 0.2.4", + "redox_syscall 0.2.5", "remove_dir_all", "winapi 0.3.9", ] @@ -7054,7 +7018,7 @@ checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" dependencies = [ "libc", "numtoa", - "redox_syscall 0.2.4", + "redox_syscall 0.2.5", "redox_termios", ] @@ -7094,15 +7058,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789" -dependencies = [ - "unicode-width", -] - [[package]] name = "textwrap" version = "0.13.4" @@ -7130,16 +7085,16 @@ checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] name = "thread_local" -version = "1.0.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] @@ -7155,9 +7110,9 @@ dependencies = [ [[package]] name = "time" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b" +checksum = "1195b046942c221454c2539395f85413b33383a067449d78aab2b7b052a142f7" dependencies = [ "const_fn", "libc", @@ -7188,7 +7143,7 @@ dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", "standback", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -7202,9 +7157,9 @@ dependencies = [ [[package]] name = "tinytemplate" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ada8616fad06a2d0c455adc530de4ef57605a8120cc65da9653e0e9623ca74" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" dependencies = [ "serde", "serde_json", @@ -7212,9 +7167,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" +checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" dependencies = [ "tinyvec_macros", ] @@ -7227,12 +7182,12 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a" +checksum = "8d56477f6ed99e10225f38f9f75f872f29b8b8bd8c0b946f63345bb144e9eeda" dependencies = [ "autocfg 1.0.1", - "bytes 1.0.1", + "bytes", "libc", "memchr", "mio", @@ -7245,16 +7200,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "tokio-executor" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures 0.1.30", -] - [[package]] name = "tokio-io-timeout" version = "1.1.1" @@ -7273,7 +7218,7 @@ checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -7288,13 +7233,13 @@ dependencies = [ [[package]] name = "tokio-retry" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c03755b956458582182941061def32b8123a26c98b08fc6ddcf49ae89d18f33" +checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ - "futures 0.1.30", - "rand 0.4.6", - "tokio-timer", + "pin-project", + "rand 0.8.3", + "tokio", ] [[package]] @@ -7310,9 +7255,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1981ad97df782ab506a1f43bf82c967326960d278acf3bf8279809648c3ff3ea" +checksum = "c535f53c0cfa1acace62995a8994fc9cc1f12d202420da96ff306ee24d576469" dependencies = [ "futures-core", "pin-project-lite", @@ -7321,29 +7266,17 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7d205f6f59b03f9e824ac86eaba635a98395f287756ecc8a06464779c399bf" +checksum = "f58403903e94d4bc56805e46597fced893410b2e753e229d3f7f22423ea03f67" dependencies = [ "async-stream", - "bytes 1.0.1", + "bytes", "futures-core", "tokio", "tokio-stream", ] -[[package]] -name = "tokio-timer" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures 0.1.30", - "slab", - "tokio-executor", -] - [[package]] name = "tokio-tungstenite" version = "0.13.0" @@ -7352,18 +7285,18 @@ checksum = "e1a5f475f1b9d077ea1017ecbc60890fda8e54942d680ca0b1d2b47cfa2d861b" dependencies = [ "futures-util", "log", - "pin-project 1.0.5", + "pin-project", "tokio", "tungstenite", ] [[package]] name = "tokio-util" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb7cb2f00c5ae8df755b252306272cd1790d39728363936e01827e11f0b017b" +checksum = "ec31e5cc6b46e653cf57762f36f71d5e6386391d88a72fd6db4508f8f676fb29" dependencies = [ - "bytes 1.0.1", + "bytes", "futures-core", "futures-io", "futures-sink", @@ -7383,13 +7316,13 @@ dependencies = [ [[package]] name = "tower" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713c629c07a3a97f741c140e474e7304294fabec66a43a33f0832e98315ab07f" +checksum = "f715efe02c0862926eb463e49368d38ddb119383475686178e32e26d15d06a66" dependencies = [ "futures-core", "futures-util", - "pin-project 1.0.5", + "pin-project", "tokio", "tokio-util", "tower-layer", @@ -7405,9 +7338,9 @@ checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" [[package]] name = "tower-service" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" @@ -7430,7 +7363,7 @@ checksum = "a8a9bd1db7706f2373a190b0d067146caa39350c486f3d455b0e33b431f94c07" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", ] [[package]] @@ -7444,11 +7377,11 @@ dependencies = [ [[package]] name = "tracing-futures" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 0.4.27", + "pin-project", "tracing", ] @@ -7456,23 +7389,9 @@ dependencies = [ name = "transaction-builder" version = "0.1.0" dependencies = [ + "diem-transaction-builder", "diem-workspace-hack", "mirai-annotations", - "transaction-builder-generated", -] - -[[package]] -name = "transaction-builder-generated" -version = "0.1.0" -dependencies = [ - "bcs", - "diem-types", - "diem-workspace-hack", - "move-core-types", - "once_cell", - "proptest", - "proptest-derive", - "serde", ] [[package]] @@ -7534,9 +7453,9 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ada8297e8d70872fa9a551d93250a9f407beb9f37ef86494eb20012a2ff7c24" dependencies = [ - "base64 0.13.0", + "base64", "byteorder", - "bytes 1.0.1", + "bytes", "http", "httparse", "input_buffer", @@ -7604,9 +7523,9 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" +checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" dependencies = [ "tinyvec", ] @@ -7663,7 +7582,7 @@ version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "294b85ef5dbc3670a72e82a89971608a1fcc4ed5c7c5a2895230d31a95f0569b" dependencies = [ - "base64 0.13.0", + "base64", "chunked_transfer", "log", "native-tls", @@ -7784,12 +7703,6 @@ dependencies = [ "vm-genesis", ] -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "wait-timeout" version = "0.2.0" @@ -7826,8 +7739,8 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dafd0aac2818a94a34df0df1100a7356c493d8ede4393875fd0b5c51bb6bc80" dependencies = [ - "bytes 1.0.1", - "futures 0.3.12", + "bytes", + "futures", "headers", "http", "hyper", @@ -7836,7 +7749,7 @@ dependencies = [ "mime_guess", "multipart", "percent-encoding", - "pin-project 1.0.5", + "pin-project", "scoped-tls", "serde", "serde_json", @@ -7865,9 +7778,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.69" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" +checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7" dependencies = [ "cfg-if 1.0.0", "serde", @@ -7877,24 +7790,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.69" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" +checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8" dependencies = [ "bumpalo", "lazy_static", "log", "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.19" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35" +checksum = "8e67a5806118af01f0d9045915676b22aaebecf4178ae7021bc171dab0b897ab" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7904,9 +7817,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.69" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" +checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b" dependencies = [ "quote 1.0.9", "wasm-bindgen-macro-support", @@ -7914,28 +7827,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.69" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" +checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.69" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" +checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1" [[package]] name = "web-sys" -version = "0.3.46" +version = "0.3.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" +checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b" dependencies = [ "js-sys", "wasm-bindgen", @@ -8121,6 +8034,6 @@ checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.64", "synstructure", ] diff --git a/client/faucet/Cargo.toml b/client/faucet/Cargo.toml index 8292ad1a8a33..48cdcf13dfa3 100644 --- a/client/faucet/Cargo.toml +++ b/client/faucet/Cargo.toml @@ -11,12 +11,13 @@ edition = "2018" [dependencies] anyhow = "1.0.38" -hex = "0.4.2" -reqwest = { version = "0.11.1", features = ["blocking"], default-features = false } -serde = "1.0.123" +hex = "0.4.3" +rand = "0.8.3" +reqwest = { version = "0.11.2", features = ["blocking"], default-features = false } +serde = "1.0.125" serde_derive = "1.0.117" structopt = "0.3.21" -tokio = { version = "1.2.0", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } warp = "0.3.0" generate-key = { path = "../../config/generate-key" } @@ -28,10 +29,10 @@ diem-logger = { path = "../../common/logger" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } move-core-types = { path = "../../language/move-core/types" } -transaction-builder-generated = { path = "../transaction-builder" } +diem-transaction-builder = { path = "../transaction-builder" } [dev-dependencies] -serde_json = "1.0.62" +serde_json = "1.0.64" tempfile = "3.2.0" diem-config = { path = "../../config" } diff --git a/client/json-rpc/Cargo.toml b/client/json-rpc/Cargo.toml index 54cf8d9febef..89c358a34ee2 100644 --- a/client/json-rpc/Cargo.toml +++ b/client/json-rpc/Cargo.toml @@ -13,12 +13,12 @@ edition = "2018" anyhow = "1.0.38" async-trait = "0.1.42" futures = "0.3.12" -hex = "0.4.2" +hex = "0.4.3" rand = "0.8.3" -reqwest = { version = "0.11.1", features = ["blocking", "json"], default_features = false } -serde = { version = "1.0.123", default-features = false } -serde_json = "1.0.62" -tokio = { version = "1.2.0", features = ["full"] } +reqwest = { version = "0.11.2", features = ["blocking", "json"], default_features = false } +serde = { version = "1.0.125", default-features = false } +serde_json = "1.0.64" +tokio = { version = "1.3.0", features = ["full"] } diem-crypto = { path = "../../crypto/crypto" } bcs = "0.1.2" diff --git a/client/swiss-knife/Cargo.toml b/client/swiss-knife/Cargo.toml index 4228216a97c3..aaaf4857ad4a 100644 --- a/client/swiss-knife/Cargo.toml +++ b/client/swiss-knife/Cargo.toml @@ -12,9 +12,9 @@ edition = "2018" [dependencies] structopt = "0.3.21" rand = "0.8.3" -hex = "0.4.2" -serde_json = "1.0.62" -serde = { version = "1.0.123", features = ["derive"] } +hex = "0.4.3" +serde_json = "1.0.64" +serde = { version = "1.0.125", features = ["derive"] } bcs = "0.1.2" diem-types = { path = "../../types" } diff --git a/client/transaction-builder/Cargo.toml b/client/transaction-builder/Cargo.toml index f2a45567bcb8..dfbb6f8eedb1 100644 --- a/client/transaction-builder/Cargo.toml +++ b/client/transaction-builder/Cargo.toml @@ -1,22 +1,21 @@ [package] -name = "transaction-builder-generated" -version = "0.1.0" +name = "diem-transaction-builder" +version = "0.0.1" authors = ["Diem Association "] description = "Generated transaction builders" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" -publish = false +publish = ["crates-io"] edition = "2018" [dependencies] bcs = "0.1.2" -once_cell = "1.7.0" -serde = { version = "1.0.123", features = ["derive"] } +once_cell = "1.7.2" +serde = { version = "1.0.125", features = ["derive"] } -move-core-types = { path = "../../language/move-core/types" } -diem-types = { path = "../../types" } -diem-workspace-hack = { path = "../../common/workspace-hack" } +move-core-types = { path = "../../language/move-core/types", version = "0.0.1" } +diem-types = { path = "../../types", version = "0.0.1" } proptest = { version = "1.0.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } @@ -25,6 +24,7 @@ proptest-derive = { version = "0.3.0", optional = true } proptest = "1.0.0" proptest-derive = "0.3.0" move-core-types = { path = "../../language/move-core/types", features = ["fuzzing"] } +diem-workspace-hack = { path = "../../common/workspace-hack" } [features] default = [] diff --git a/common/bitvec/Cargo.toml b/common/bitvec/Cargo.toml index be2e8116d4aa..1a16b8ec8e3a 100644 --- a/common/bitvec/Cargo.toml +++ b/common/bitvec/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" diem-workspace-hack = { path = "../workspace-hack" } proptest = { version = "1.0.0", default-features = true, optional = true } proptest-derive = { version = "0.3.0", optional = true } -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } serde_bytes = "0.11.5" [dev-dependencies] diff --git a/common/crash-handler/Cargo.toml b/common/crash-handler/Cargo.toml index 03ac58926fd1..0d28d750afe2 100644 --- a/common/crash-handler/Cargo.toml +++ b/common/crash-handler/Cargo.toml @@ -15,4 +15,4 @@ toml = "0.5.8" diem-logger = { path = "../logger" } diem-workspace-hack = { path = "../workspace-hack" } -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } diff --git a/common/diemdoc/Cargo.toml b/common/diemdoc/Cargo.toml index 76bd8a5670d5..7266680d683d 100644 --- a/common/diemdoc/Cargo.toml +++ b/common/diemdoc/Cargo.toml @@ -12,16 +12,16 @@ edition = "2018" [dependencies] serde_yaml = "0.8.17" serde-reflection = "0.3.2" -serde-generate = "0.18.0" +serde-generate = "0.19.1" anyhow = "1.0.38" regex = "1.4.3" structopt = "0.3.21" -once_cell = "1.7.0" +once_cell = "1.7.2" diem-workspace-hack = { path = "../workspace-hack" } [dev-dependencies] -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } tempfile = "3.2.0" [features] diff --git a/common/logger/Cargo.toml b/common/logger/Cargo.toml index ce69cfb483a8..f105d4d4f528 100644 --- a/common/logger/Cargo.toml +++ b/common/logger/Cargo.toml @@ -19,7 +19,7 @@ hostname = "0.3.1" diem-log-derive = { path = "derive" } diem-infallible = { path = "../infallible" } diem-workspace-hack = { path = "../workspace-hack" } -once_cell = "1.7.0" -serde = { version = "1.0.123", features = ["derive"] } -serde_json = "1.0.62" -prometheus = { version = "0.11.0", default-features = false } +once_cell = "1.7.2" +serde = { version = "1.0.125", features = ["derive"] } +serde_json = "1.0.64" +prometheus = { version = "0.12.0", default-features = false } diff --git a/common/nibble/Cargo.toml b/common/nibble/Cargo.toml index b2a244b492df..afcadfd83eda 100644 --- a/common/nibble/Cargo.toml +++ b/common/nibble/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] diem-workspace-hack = { path = "../workspace-hack" } proptest = { version = "1.0.0", optional = true } -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } [features] default = [] diff --git a/common/short-hex-str/Cargo.toml b/common/short-hex-str/Cargo.toml index 8d29afd1ca98..50e710137ef2 100644 --- a/common/short-hex-str/Cargo.toml +++ b/common/short-hex-str/Cargo.toml @@ -11,12 +11,12 @@ edition = "2018" [dependencies] mirai-annotations = "1.10.1" -serde = { version = "1.0.123", default-features = false } +serde = { version = "1.0.125", default-features = false } static_assertions = "1.1.0" thiserror = "1.0.24" diem-workspace-hack = { path = "../workspace-hack" } [dev-dependencies] -hex = "0.4.2" +hex = "0.4.3" proptest = "1.0.0" diff --git a/common/trace/Cargo.toml b/common/trace/Cargo.toml index dccc88efa7fe..851d6880a01c 100644 --- a/common/trace/Cargo.toml +++ b/common/trace/Cargo.toml @@ -12,12 +12,12 @@ edition = "2018" [dependencies] chrono = "0.4.19" structopt = "0.3.21" -tokio = { version = "1.2.0", features = ["full"] } -serde_json = "1.0.62" -serde = "1.0.123" +tokio = { version = "1.3.0", features = ["full"] } +serde_json = "1.0.64" +serde = "1.0.125" anyhow = "1.0.38" -reqwest = { version = "0.11.1", features = ["blocking", "json"], default_features = false } -once_cell = "1.7.0" +reqwest = { version = "0.11.2", features = ["blocking", "json"], default_features = false } +once_cell = "1.7.2" diem-logger = { path = "../logger" } diem-metrics = { path = "../metrics" } diff --git a/common/workspace-hack/Cargo.toml b/common/workspace-hack/Cargo.toml index 092dd46084e2..06d13fd57113 100644 --- a/common/workspace-hack/Cargo.toml +++ b/common/workspace-hack/Cargo.toml @@ -11,13 +11,13 @@ edition = "2018" ### BEGIN HAKARI SECTION [target.x86_64-unknown-linux-gnu.dependencies] -byteorder = { version = "1.4.2", features = ["default", "i128", "std"] } +byteorder = { version = "1.4.3", features = ["default", "i128", "std"] } bytes = { version = "1.0.1", features = ["default", "serde", "std"] } chrono = { version = "0.4.19", features = ["clock", "default", "libc", "oldtime", "serde", "std", "time", "winapi"] } clap = { version = "2.33.3", features = ["ansi_term", "atty", "color", "default", "strsim", "suggestions", "vec_map"] } crossbeam-channel = { version = "0.5.0", features = ["crossbeam-utils", "default", "std"] } crossbeam-deque = { version = "0.8.0", features = ["crossbeam-epoch", "crossbeam-utils", "default", "std"] } -crossbeam-utils = { version = "0.8.2", features = ["default", "lazy_static", "std"] } +crossbeam-utils = { version = "0.8.3", features = ["default", "lazy_static", "std"] } either = { version = "1.6.1", features = ["default", "use_std"] } fail = { version = "0.4.0", default-features = false, features = ["failpoints"] } futures = { version = "0.3.12", features = ["alloc", "async-await", "default", "executor", "futures-executor", "std"] } @@ -28,39 +28,42 @@ futures-sink = { version = "0.3.13", features = ["alloc", "default", "std"] } futures-task = { version = "0.3.12", default-features = false, features = ["alloc", "once_cell", "std"] } futures-util = { version = "0.3.12", features = ["alloc", "async-await", "async-await-macro", "channel", "default", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "proc-macro-hack", "proc-macro-nested", "sink", "slab", "std"] } hyper = { version = "0.14.4", features = ["client", "default", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] } +indexmap = { version = "1.6.2", default-features = false, features = ["std"] } itertools = { version = "0.10.0", features = ["default", "use_alloc", "use_std"] } itoa = { version = "0.4.7", features = ["default", "std"] } -libc = { version = "0.2.86", features = ["align", "default", "extra_traits", "std"] } +libc = { version = "0.2.89", features = ["align", "default", "extra_traits", "std"] } log = { version = "0.4.14", default-features = false, features = ["serde", "std"] } memchr = { version = "2.3.4", features = ["default", "std", "use_std"] } num-integer = { version = "0.1.44", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2.14", features = ["default", "i128", "std"] } -once_cell = { version = "1.7.0", features = ["alloc", "default", "race", "std"] } +once_cell = { version = "1.7.2", features = ["alloc", "default", "race", "std"] } petgraph = { version = "0.5.1", features = ["default", "graphmap", "matrix_graph", "stable_graph"] } prost = { version = "0.7.0", features = ["default", "prost-derive", "std"] } rand = { version = "0.8.3", features = ["alloc", "default", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] } -reqwest = { version = "0.11.1", features = ["__tls", "blocking", "default", "default-tls", "hyper-tls", "json", "native-tls", "native-tls-crate", "serde_json", "stream", "tokio-native-tls"] } +regex = { version = "1.4.3", features = ["aho-corasick", "default", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "thread_local", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +regex-syntax = { version = "0.6.23", features = ["default", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +reqwest = { version = "0.11.2", features = ["__tls", "blocking", "default", "default-tls", "hyper-tls", "json", "native-tls", "native-tls-crate", "serde_json", "stream", "tokio-native-tls"] } rusty-fork = { version = "0.3.0", features = ["default", "timeout", "wait-timeout"] } -serde = { version = "1.0.123", features = ["alloc", "default", "derive", "rc", "serde_derive", "std"] } -serde_json = { version = "1.0.62", features = ["default", "indexmap", "preserve_order", "std"] } +serde = { version = "1.0.125", features = ["alloc", "default", "derive", "rc", "serde_derive", "std"] } +serde_json = { version = "1.0.64", features = ["default", "indexmap", "preserve_order", "std"] } standback = { version = "0.2.15", default-features = false, features = ["std"] } subtle = { version = "2.4.0", default-features = false, features = ["std"] } -tokio = { version = "1.2.0", features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] } -tokio-util = { version = "0.6.3", features = ["codec", "compat", "default", "futures-io", "io"] } +tokio = { version = "1.3.0", features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] } +tokio-util = { version = "0.6.4", features = ["codec", "compat", "default", "futures-io", "io"] } toml = { version = "0.5.8", features = ["default"] } tracing = { version = "0.1.25", features = ["attributes", "default", "log", "std", "tracing-attributes"] } warp = { version = "0.3.0", features = ["default", "multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] } zeroize = { version = "1.2.0", features = ["alloc", "default", "zeroize_derive"] } [target.x86_64-unknown-linux-gnu.build-dependencies] -byteorder = { version = "1.4.2", features = ["default", "i128", "std"] } +byteorder = { version = "1.4.3", features = ["default", "i128", "std"] } bytes = { version = "1.0.1", features = ["default", "serde", "std"] } cc = { version = "1.0.67", default-features = false, features = ["jobserver", "parallel"] } chrono = { version = "0.4.19", features = ["clock", "default", "libc", "oldtime", "serde", "std", "time", "winapi"] } clap = { version = "2.33.3", features = ["ansi_term", "atty", "color", "default", "strsim", "suggestions", "vec_map"] } crossbeam-channel = { version = "0.5.0", features = ["crossbeam-utils", "default", "std"] } crossbeam-deque = { version = "0.8.0", features = ["crossbeam-epoch", "crossbeam-utils", "default", "std"] } -crossbeam-utils = { version = "0.8.2", features = ["default", "lazy_static", "std"] } +crossbeam-utils = { version = "0.8.3", features = ["default", "lazy_static", "std"] } either = { version = "1.6.1", features = ["default", "use_std"] } fail = { version = "0.4.0", default-features = false, features = ["failpoints"] } futures = { version = "0.3.12", features = ["alloc", "async-await", "default", "executor", "futures-executor", "std"] } @@ -71,42 +74,45 @@ futures-sink = { version = "0.3.13", features = ["alloc", "default", "std"] } futures-task = { version = "0.3.12", default-features = false, features = ["alloc", "once_cell", "std"] } futures-util = { version = "0.3.12", features = ["alloc", "async-await", "async-await-macro", "channel", "default", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "proc-macro-hack", "proc-macro-nested", "sink", "slab", "std"] } hyper = { version = "0.14.4", features = ["client", "default", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] } +indexmap = { version = "1.6.2", default-features = false, features = ["std"] } itertools = { version = "0.10.0", features = ["default", "use_alloc", "use_std"] } itoa = { version = "0.4.7", features = ["default", "std"] } -libc = { version = "0.2.86", features = ["align", "default", "extra_traits", "std"] } +libc = { version = "0.2.89", features = ["align", "default", "extra_traits", "std"] } log = { version = "0.4.14", default-features = false, features = ["serde", "std"] } memchr = { version = "2.3.4", features = ["default", "std", "use_std"] } num-integer = { version = "0.1.44", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2.14", features = ["default", "i128", "std"] } -once_cell = { version = "1.7.0", features = ["alloc", "default", "race", "std"] } +once_cell = { version = "1.7.2", features = ["alloc", "default", "race", "std"] } petgraph = { version = "0.5.1", features = ["default", "graphmap", "matrix_graph", "stable_graph"] } proc-macro2 = { version = "0.4.30", features = ["default", "proc-macro"] } prost = { version = "0.7.0", features = ["default", "prost-derive", "std"] } quote = { version = "0.6.13", features = ["default", "proc-macro"] } rand = { version = "0.8.3", features = ["alloc", "default", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] } -reqwest = { version = "0.11.1", features = ["__tls", "blocking", "default", "default-tls", "hyper-tls", "json", "native-tls", "native-tls-crate", "serde_json", "stream", "tokio-native-tls"] } +regex = { version = "1.4.3", features = ["aho-corasick", "default", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "thread_local", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +regex-syntax = { version = "0.6.23", features = ["default", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +reqwest = { version = "0.11.2", features = ["__tls", "blocking", "default", "default-tls", "hyper-tls", "json", "native-tls", "native-tls-crate", "serde_json", "stream", "tokio-native-tls"] } rusty-fork = { version = "0.3.0", features = ["default", "timeout", "wait-timeout"] } -serde = { version = "1.0.123", features = ["alloc", "default", "derive", "rc", "serde_derive", "std"] } -serde_json = { version = "1.0.62", features = ["default", "indexmap", "preserve_order", "std"] } +serde = { version = "1.0.125", features = ["alloc", "default", "derive", "rc", "serde_derive", "std"] } +serde_json = { version = "1.0.64", features = ["default", "indexmap", "preserve_order", "std"] } standback = { version = "0.2.15", default-features = false, features = ["std"] } subtle = { version = "2.4.0", default-features = false, features = ["std"] } syn-3575ec1268b04181 = { package = "syn", version = "0.15.44", features = ["clone-impls", "default", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit"] } -syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.60", features = ["clone-impls", "default", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] } -tokio = { version = "1.2.0", features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] } -tokio-util = { version = "0.6.3", features = ["codec", "compat", "default", "futures-io", "io"] } +syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.64", features = ["clone-impls", "default", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] } +tokio = { version = "1.3.0", features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] } +tokio-util = { version = "0.6.4", features = ["codec", "compat", "default", "futures-io", "io"] } toml = { version = "0.5.8", features = ["default"] } tracing = { version = "0.1.25", features = ["attributes", "default", "log", "std", "tracing-attributes"] } warp = { version = "0.3.0", features = ["default", "multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] } zeroize = { version = "1.2.0", features = ["alloc", "default", "zeroize_derive"] } [target.x86_64-apple-darwin.dependencies] -byteorder = { version = "1.4.2", features = ["default", "i128", "std"] } +byteorder = { version = "1.4.3", features = ["default", "i128", "std"] } bytes = { version = "1.0.1", features = ["default", "serde", "std"] } chrono = { version = "0.4.19", features = ["clock", "default", "libc", "oldtime", "serde", "std", "time", "winapi"] } clap = { version = "2.33.3", features = ["ansi_term", "atty", "color", "default", "strsim", "suggestions", "vec_map"] } crossbeam-channel = { version = "0.5.0", features = ["crossbeam-utils", "default", "std"] } crossbeam-deque = { version = "0.8.0", features = ["crossbeam-epoch", "crossbeam-utils", "default", "std"] } -crossbeam-utils = { version = "0.8.2", features = ["default", "lazy_static", "std"] } +crossbeam-utils = { version = "0.8.3", features = ["default", "lazy_static", "std"] } either = { version = "1.6.1", features = ["default", "use_std"] } fail = { version = "0.4.0", default-features = false, features = ["failpoints"] } futures = { version = "0.3.12", features = ["alloc", "async-await", "default", "executor", "futures-executor", "std"] } @@ -117,39 +123,42 @@ futures-sink = { version = "0.3.13", features = ["alloc", "default", "std"] } futures-task = { version = "0.3.12", default-features = false, features = ["alloc", "once_cell", "std"] } futures-util = { version = "0.3.12", features = ["alloc", "async-await", "async-await-macro", "channel", "default", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "proc-macro-hack", "proc-macro-nested", "sink", "slab", "std"] } hyper = { version = "0.14.4", features = ["client", "default", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] } +indexmap = { version = "1.6.2", default-features = false, features = ["std"] } itertools = { version = "0.10.0", features = ["default", "use_alloc", "use_std"] } itoa = { version = "0.4.7", features = ["default", "std"] } -libc = { version = "0.2.86", features = ["align", "default", "extra_traits", "std"] } +libc = { version = "0.2.89", features = ["align", "default", "extra_traits", "std"] } log = { version = "0.4.14", default-features = false, features = ["serde", "std"] } memchr = { version = "2.3.4", features = ["default", "std", "use_std"] } num-integer = { version = "0.1.44", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2.14", features = ["default", "i128", "std"] } -once_cell = { version = "1.7.0", features = ["alloc", "default", "race", "std"] } +once_cell = { version = "1.7.2", features = ["alloc", "default", "race", "std"] } petgraph = { version = "0.5.1", features = ["default", "graphmap", "matrix_graph", "stable_graph"] } prost = { version = "0.7.0", features = ["default", "prost-derive", "std"] } rand = { version = "0.8.3", features = ["alloc", "default", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] } -reqwest = { version = "0.11.1", features = ["__tls", "blocking", "default", "default-tls", "hyper-tls", "json", "native-tls", "native-tls-crate", "serde_json", "stream", "tokio-native-tls"] } +regex = { version = "1.4.3", features = ["aho-corasick", "default", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "thread_local", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +regex-syntax = { version = "0.6.23", features = ["default", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +reqwest = { version = "0.11.2", features = ["__tls", "blocking", "default", "default-tls", "hyper-tls", "json", "native-tls", "native-tls-crate", "serde_json", "stream", "tokio-native-tls"] } rusty-fork = { version = "0.3.0", features = ["default", "timeout", "wait-timeout"] } -serde = { version = "1.0.123", features = ["alloc", "default", "derive", "rc", "serde_derive", "std"] } -serde_json = { version = "1.0.62", features = ["default", "indexmap", "preserve_order", "std"] } +serde = { version = "1.0.125", features = ["alloc", "default", "derive", "rc", "serde_derive", "std"] } +serde_json = { version = "1.0.64", features = ["default", "indexmap", "preserve_order", "std"] } standback = { version = "0.2.15", default-features = false, features = ["std"] } subtle = { version = "2.4.0", default-features = false, features = ["std"] } -tokio = { version = "1.2.0", features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] } -tokio-util = { version = "0.6.3", features = ["codec", "compat", "default", "futures-io", "io"] } +tokio = { version = "1.3.0", features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] } +tokio-util = { version = "0.6.4", features = ["codec", "compat", "default", "futures-io", "io"] } toml = { version = "0.5.8", features = ["default"] } tracing = { version = "0.1.25", features = ["attributes", "default", "log", "std", "tracing-attributes"] } warp = { version = "0.3.0", features = ["default", "multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] } zeroize = { version = "1.2.0", features = ["alloc", "default", "zeroize_derive"] } [target.x86_64-apple-darwin.build-dependencies] -byteorder = { version = "1.4.2", features = ["default", "i128", "std"] } +byteorder = { version = "1.4.3", features = ["default", "i128", "std"] } bytes = { version = "1.0.1", features = ["default", "serde", "std"] } cc = { version = "1.0.67", default-features = false, features = ["jobserver", "parallel"] } chrono = { version = "0.4.19", features = ["clock", "default", "libc", "oldtime", "serde", "std", "time", "winapi"] } clap = { version = "2.33.3", features = ["ansi_term", "atty", "color", "default", "strsim", "suggestions", "vec_map"] } crossbeam-channel = { version = "0.5.0", features = ["crossbeam-utils", "default", "std"] } crossbeam-deque = { version = "0.8.0", features = ["crossbeam-epoch", "crossbeam-utils", "default", "std"] } -crossbeam-utils = { version = "0.8.2", features = ["default", "lazy_static", "std"] } +crossbeam-utils = { version = "0.8.3", features = ["default", "lazy_static", "std"] } either = { version = "1.6.1", features = ["default", "use_std"] } fail = { version = "0.4.0", default-features = false, features = ["failpoints"] } futures = { version = "0.3.12", features = ["alloc", "async-await", "default", "executor", "futures-executor", "std"] } @@ -160,29 +169,32 @@ futures-sink = { version = "0.3.13", features = ["alloc", "default", "std"] } futures-task = { version = "0.3.12", default-features = false, features = ["alloc", "once_cell", "std"] } futures-util = { version = "0.3.12", features = ["alloc", "async-await", "async-await-macro", "channel", "default", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "proc-macro-hack", "proc-macro-nested", "sink", "slab", "std"] } hyper = { version = "0.14.4", features = ["client", "default", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] } +indexmap = { version = "1.6.2", default-features = false, features = ["std"] } itertools = { version = "0.10.0", features = ["default", "use_alloc", "use_std"] } itoa = { version = "0.4.7", features = ["default", "std"] } -libc = { version = "0.2.86", features = ["align", "default", "extra_traits", "std"] } +libc = { version = "0.2.89", features = ["align", "default", "extra_traits", "std"] } log = { version = "0.4.14", default-features = false, features = ["serde", "std"] } memchr = { version = "2.3.4", features = ["default", "std", "use_std"] } num-integer = { version = "0.1.44", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2.14", features = ["default", "i128", "std"] } -once_cell = { version = "1.7.0", features = ["alloc", "default", "race", "std"] } +once_cell = { version = "1.7.2", features = ["alloc", "default", "race", "std"] } petgraph = { version = "0.5.1", features = ["default", "graphmap", "matrix_graph", "stable_graph"] } proc-macro2 = { version = "0.4.30", features = ["default", "proc-macro"] } prost = { version = "0.7.0", features = ["default", "prost-derive", "std"] } quote = { version = "0.6.13", features = ["default", "proc-macro"] } rand = { version = "0.8.3", features = ["alloc", "default", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] } -reqwest = { version = "0.11.1", features = ["__tls", "blocking", "default", "default-tls", "hyper-tls", "json", "native-tls", "native-tls-crate", "serde_json", "stream", "tokio-native-tls"] } +regex = { version = "1.4.3", features = ["aho-corasick", "default", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "thread_local", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +regex-syntax = { version = "0.6.23", features = ["default", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +reqwest = { version = "0.11.2", features = ["__tls", "blocking", "default", "default-tls", "hyper-tls", "json", "native-tls", "native-tls-crate", "serde_json", "stream", "tokio-native-tls"] } rusty-fork = { version = "0.3.0", features = ["default", "timeout", "wait-timeout"] } -serde = { version = "1.0.123", features = ["alloc", "default", "derive", "rc", "serde_derive", "std"] } -serde_json = { version = "1.0.62", features = ["default", "indexmap", "preserve_order", "std"] } +serde = { version = "1.0.125", features = ["alloc", "default", "derive", "rc", "serde_derive", "std"] } +serde_json = { version = "1.0.64", features = ["default", "indexmap", "preserve_order", "std"] } standback = { version = "0.2.15", default-features = false, features = ["std"] } subtle = { version = "2.4.0", default-features = false, features = ["std"] } syn-3575ec1268b04181 = { package = "syn", version = "0.15.44", features = ["clone-impls", "default", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit"] } -syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.60", features = ["clone-impls", "default", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] } -tokio = { version = "1.2.0", features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] } -tokio-util = { version = "0.6.3", features = ["codec", "compat", "default", "futures-io", "io"] } +syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.64", features = ["clone-impls", "default", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] } +tokio = { version = "1.3.0", features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] } +tokio-util = { version = "0.6.4", features = ["codec", "compat", "default", "futures-io", "io"] } toml = { version = "0.5.8", features = ["default"] } tracing = { version = "0.1.25", features = ["attributes", "default", "log", "std", "tracing-attributes"] } warp = { version = "0.3.0", features = ["default", "multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] } diff --git a/config/Cargo.toml b/config/Cargo.toml index f693004d15ea..96551c257bb9 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -14,7 +14,7 @@ get_if_addrs = { version = "0.5.3", default-features = false } log = { version = "0.4.14", features = ["serde"] } mirai-annotations = "1.10.1" rand = "0.8.3" -serde = { version = "1.0.123", features = ["rc"], default-features = false } +serde = { version = "1.0.125", features = ["rc"], default-features = false } serde_yaml = "0.8.17" thiserror = "1.0.24" diff --git a/config/management/Cargo.toml b/config/management/Cargo.toml index c1bc11bb23f1..81a78238eff2 100644 --- a/config/management/Cargo.toml +++ b/config/management/Cargo.toml @@ -11,8 +11,8 @@ edition = "2018" [dependencies] anyhow = "1.0.38" -hex = "0.4.2" -serde = { version = "1.0.123", features = ["rc"], default-features = false } +hex = "0.4.3" +serde = { version = "1.0.125", features = ["rc"], default-features = false } serde_yaml = "0.8.17" structopt = "0.3.21" thiserror = "1.0.24" diff --git a/config/management/genesis/Cargo.toml b/config/management/genesis/Cargo.toml index efd4cdd19a49..a6dc80fc6b4b 100644 --- a/config/management/genesis/Cargo.toml +++ b/config/management/genesis/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] anyhow = "1.0.38" rand = "0.8.3" -serde = { version = "1.0.123", features = ["rc"], default-features = false } +serde = { version = "1.0.125", features = ["rc"], default-features = false } structopt = "0.3.21" thiserror = "1.0.24" toml = { version = "0.5.8", default-features = false } diff --git a/config/management/network-address-encryption/Cargo.toml b/config/management/network-address-encryption/Cargo.toml index 3cfc73937492..be2f803b7668 100644 --- a/config/management/network-address-encryption/Cargo.toml +++ b/config/management/network-address-encryption/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] base64 = "0.13.0" -serde = { version = "1.0.123", features = ["rc"], default-features = false } +serde = { version = "1.0.125", features = ["rc"], default-features = false } thiserror = "1.0.24" bcs = "0.1.2" diff --git a/config/management/operational/Cargo.toml b/config/management/operational/Cargo.toml index 2d6915ecf44f..2bdfd55726b5 100644 --- a/config/management/operational/Cargo.toml +++ b/config/management/operational/Cargo.toml @@ -11,9 +11,9 @@ edition = "2018" [dependencies] anyhow = "1.0.38" -hex = "0.4.2" -serde = { version = "1.0.123", features = ["rc"], default-features = false } -serde_json = "1.0.62" +hex = "0.4.3" +serde = { version = "1.0.125", features = ["rc"], default-features = false } +serde_json = "1.0.64" structopt = "0.3.21" thiserror = "1.0.24" toml = { version = "0.5.8", default-features = false } diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index 86bc502f4a6a..35a0c8429861 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] anyhow = "1.0.38" async-trait = "0.1.42" -byteorder = { version = "1.4.2", default-features = false } +byteorder = { version = "1.4.3", default-features = false } bytes = "1.0.1" fail = "0.4.0" futures = "0.3.12" @@ -20,14 +20,14 @@ itertools = { version = "0.10.0", default-features = false } mirai-annotations = { version = "1.10.1", default-features = false } num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -once_cell = "1.7.0" +once_cell = "1.7.2" proptest = { version = "1.0.0", optional = true } rand = { version = "0.8.3", default-features = false } -serde = { version = "1.0.123", default-features = false } -serde_json = "1.0.62" +serde = { version = "1.0.125", default-features = false } +serde_json = "1.0.64" termion = { version = "1.5.6", default-features = false } thiserror = "1.0.24" -tokio = { version = "1.2.0", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } channel = { path = "../common/channel" } consensus-types = { path = "consensus-types", default-features = false } diff --git a/consensus/consensus-types/Cargo.toml b/consensus/consensus-types/Cargo.toml index 5e666db4007a..a326a6774d55 100644 --- a/consensus/consensus-types/Cargo.toml +++ b/consensus/consensus-types/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" anyhow = "1.0.38" mirai-annotations = { version = "1.10.1", default-features = false } proptest = { version = "1.0.0", optional = true } -serde = { version = "1.0.123", default-features = false } +serde = { version = "1.0.125", default-features = false } executor-types = { path = "../../execution/executor-types" } bcs = "0.1.2" diff --git a/consensus/safety-rules/Cargo.toml b/consensus/safety-rules/Cargo.toml index d46b1abc0bd7..ed749e9d20f1 100644 --- a/consensus/safety-rules/Cargo.toml +++ b/consensus/safety-rules/Cargo.toml @@ -7,7 +7,7 @@ publish = false edition = "2018" [dependencies] -once_cell = "1.7.0" +once_cell = "1.7.2" rand = { version = "0.8.3", default-features = false } proptest = { version = "1.0.0", optional = true } rand_core = "0.6.2" @@ -28,7 +28,7 @@ diem-temppath = { path = "../../common/temppath" } diem-types = { path = "../../types" } diem-vault-client = { path = "../../secure/storage/vault" } diem-workspace-hack = { path = "../../common/workspace-hack" } -serde = { version = "1.0.123", default-features = false } +serde = { version = "1.0.125", default-features = false } thiserror = "1.0.24" [dev-dependencies] diff --git a/crypto/crypto/Cargo.toml b/crypto/crypto/Cargo.toml index 41936dc49c36..ceb518e59f68 100644 --- a/crypto/crypto/Cargo.toml +++ b/crypto/crypto/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "diem-crypto" -version = "0.1.0" +version = "0.0.1" authors = ["Diem Association "] description = "Diem diem-crypto" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" -publish = false +publish = ["crates-io"] edition = "2018" [dependencies] @@ -15,15 +15,15 @@ bytes = "1.0.1" curve25519-dalek = { version = "0.1.0", package = "curve25519-dalek-fiat", default-features = false, features = ["std"] } digest = "0.9.0" ed25519-dalek = { version = "0.1.0", package = "ed25519-dalek-fiat", default-features = false, features = ["std", "serde"] } -hex = "0.4.2" +hex = "0.4.3" hkdf = "0.10.0" -once_cell = "1.7.0" +once_cell = "1.7.2" mirai-annotations = "1.10.1" proptest = { version = "1.0.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } rand = "0.8.0" rand_core = { version = "0.6.2", default-features = false } -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } serde_bytes = "0.11.5" serde-name = "0.1.1" sha2 = "0.9.3" @@ -32,21 +32,22 @@ thiserror = "1.0.24" tiny-keccak = { version = "2.0.2", features = ["sha3"] } x25519-dalek = { version = "0.1.0", package = "x25519-dalek-fiat", default-features = false, features = ["std"] } aes-gcm = "0.8.0" -diem-crypto-derive = { path = "../crypto-derive" } +diem-crypto-derive = { path = "../crypto-derive", version = "0.0.1" } bcs = "0.1.2" -diem-workspace-hack = { path = "../../common/workspace-hack" } [dev-dependencies] bitvec = "0.19.4" -byteorder = "1.4.2" +byteorder = "1.4.3" proptest = "1.0.0" proptest-derive = "0.3.0" ripemd160 = "0.9.1" criterion = "0.3.4" sha3 = "0.9.1" -serde_json = "1.0.62" +serde_json = "1.0.64" trybuild = "1.0.41" +diem-workspace-hack = { path = "../../common/workspace-hack" } + [features] default = ["fiat"] assert-private-keys-not-cloneable = [] diff --git a/devtools/x-core/Cargo.toml b/devtools/x-core/Cargo.toml index f6b2e26a1f96..af326db92c8c 100644 --- a/devtools/x-core/Cargo.toml +++ b/devtools/x-core/Cargo.toml @@ -8,14 +8,14 @@ publish = false license = "Apache-2.0" [dependencies] -camino = { version = "1.0.0", features = ["serde1"] } -determinator = "0.3.0" -guppy = "0.8.0" +camino = { version = "1.0.3", features = ["serde1"] } +determinator = "0.4.0" +guppy = "0.9.0" indoc = "1.0.3" -hakari = { version = "0.2.0", features = ["summaries"] } -hex = "0.4.2" +hakari = { version = "0.3.0", features = ["summaries"] } +hex = "0.4.3" log = "0.4.14" toml = "0.5.8" -once_cell = "1.7.0" +once_cell = "1.7.2" rental = "0.5.5" -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } diff --git a/devtools/x-lint/Cargo.toml b/devtools/x-lint/Cargo.toml index 95ff9cc3bd3a..b64c61e3fff9 100644 --- a/devtools/x-lint/Cargo.toml +++ b/devtools/x-lint/Cargo.toml @@ -8,10 +8,10 @@ publish = false license = "Apache-2.0" [dependencies] -camino = "1.0.0" -guppy = "0.8.0" -hakari = "0.2.0" -once_cell = "1.7.0" +camino = "1.0.3" +guppy = "0.9.0" +hakari = "0.3.0" +once_cell = "1.7.2" toml = "0.5.8" -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } x-core = { path = "../x-core" } diff --git a/devtools/x/Cargo.toml b/devtools/x/Cargo.toml index f01d0768c7cc..3c4350891e55 100644 --- a/devtools/x/Cargo.toml +++ b/devtools/x/Cargo.toml @@ -8,15 +8,15 @@ publish = false license = "Apache-2.0" [dependencies] -camino = "1.0.0" -determinator = "0.3.0" -serde = { version = "1.0.123", features = ["derive"] } -serde_json = "1.0.62" +camino = "1.0.3" +determinator = "0.4.0" +serde = { version = "1.0.125", features = ["derive"] } +serde_json = "1.0.64" structopt = "0.3.21" anyhow = "1.0.38" colored-diff = "0.2.2" -guppy = { version = "0.8.0", features = ["summaries"] } -hakari = "0.2.0" +guppy = { version = "0.9.0", features = ["summaries"] } +hakari = "0.3.0" indoc = "1.0.3" toml = "0.5.8" env_logger = "0.8.3" @@ -25,6 +25,6 @@ chrono = "0.4.19" globset = "0.4.6" regex = "1.4.3" rayon = "1.5.0" -indexmap = "1.6.1" +indexmap = "1.6.2" x-core = { path = "../x-core" } x-lint = { path = "../x-lint" } diff --git a/execution/execution-correctness/Cargo.toml b/execution/execution-correctness/Cargo.toml index 910df94fe96e..e32a359c1b15 100644 --- a/execution/execution-correctness/Cargo.toml +++ b/execution/execution-correctness/Cargo.toml @@ -25,7 +25,7 @@ diem-temppath = { path = "../../common/temppath" } diem-types = { path = "../../types" } diem-vm = { path = "../../language/diem-vm" } diem-workspace-hack = { path = "../../common/workspace-hack" } -serde = { version = "1.0.123", default-features = false } +serde = { version = "1.0.125", default-features = false } storage-client = { path = "../../storage/storage-client" } thiserror = "1.0.24" # this is actually a dev-dependency (see "Conditional compilation of tests" in coding_guidelines.md) diff --git a/execution/executor-types/Cargo.toml b/execution/executor-types/Cargo.toml index b2c6dbd1efde..d30b55c612c0 100644 --- a/execution/executor-types/Cargo.toml +++ b/execution/executor-types/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.38" -serde = { version = "1.0.123", default-features = false } +serde = { version = "1.0.125", default-features = false } thiserror = "1.0.24" bcs = "0.1.2" diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml index d7f8051676da..af5d2816d096 100644 --- a/execution/executor/Cargo.toml +++ b/execution/executor/Cargo.toml @@ -13,9 +13,9 @@ edition = "2018" anyhow = "1.0.38" fail = "0.4.0" itertools = { version = "0.10.0", default-features = false } -once_cell = "1.7.0" -serde_json = "1.0.62" -serde = { version = "1.0.123", features = ["derive"] } +once_cell = "1.7.2" +serde_json = "1.0.64" +serde = { version = "1.0.125", features = ["derive"] } consensus-types = { path = "../../consensus/consensus-types"} executor-types = { path = "../executor-types" } diff --git a/json-rpc/Cargo.toml b/json-rpc/Cargo.toml index 94758dad5e38..fddc5e90fc98 100644 --- a/json-rpc/Cargo.toml +++ b/json-rpc/Cargo.toml @@ -13,15 +13,15 @@ edition = "2018" anyhow = "1.0.38" fail = "0.4.0" futures = "0.3.12" -hex = "0.4.2" +hex = "0.4.3" hyper = "0.14.4" -once_cell = "1.7.0" +once_cell = "1.7.2" rand = "0.8.3" -serde_json = "1.0.62" -serde = { version = "1.0.123", features = ["derive"], default-features = false } -tokio = { version = "1.2.0", features = ["full"] } +serde_json = "1.0.64" +serde = { version = "1.0.125", features = ["derive"], default-features = false } +tokio = { version = "1.3.0", features = ["full"] } warp = { version = "0.3.0", features = ["tls"] } -reqwest = { version = "0.11.1", features = ["blocking", "json"], default_features = false, optional = true } +reqwest = { version = "0.11.2", features = ["blocking", "json"], default_features = false, optional = true } proptest = { version = "1.0.0", optional = true } bcs = "0.1.2" @@ -45,7 +45,7 @@ storage-interface = { path = "../storage/storage-interface" } [dev-dependencies] proptest = "1.0.0" -reqwest = { version = "0.11.1", features = ["blocking", "json"], default_features = false } +reqwest = { version = "0.11.2", features = ["blocking", "json"], default_features = false } rand = { version = "0.8.3" } generate-key = { path = "../config/generate-key" } @@ -63,7 +63,7 @@ executor = { path = "../execution/executor" } executor-types = { path = "../execution/executor-types" } scratchpad = { path = "../storage/scratchpad" } move-vm-types = { path = "../language/move-vm/types" } -transaction-builder-generated = { path = "../client/transaction-builder" } +diem-transaction-builder = { path = "../client/transaction-builder" } diem-node = { path = "../diem-node" } [features] diff --git a/json-rpc/types/Cargo.toml b/json-rpc/types/Cargo.toml index 200456908b86..7230c3cb6464 100644 --- a/json-rpc/types/Cargo.toml +++ b/json-rpc/types/Cargo.toml @@ -1,26 +1,28 @@ [package] name = "diem-json-rpc-types" -version = "0.1.0" +version = "0.0.1" authors = ["Diem Association "] description = "Diem JSONRPC Types" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" -publish = false +publish = ["crates-io"] edition = "2018" [dependencies] anyhow = "1.0.38" -hex = "0.4.2" -serde = { version = "1.0.123", default-features = false } -serde_json = "1.0.62" +hex = "0.4.3" +serde = { version = "1.0.125", default-features = false } +serde_json = "1.0.64" prost = "0.7.0" bcs = "0.1.2" -diem-types = { path = "../../types" } -diem-crypto = { path = "../../crypto/crypto" } +diem-types = { path = "../../types", version = "0.0.1" } +diem-crypto = { path = "../../crypto/crypto", version = "0.0.1" } +move-core-types = { path = "../../language/move-core/types", version = "0.0.1" } + +[dev-dependencies] diem-workspace-hack = { path = "../../common/workspace-hack" } -move-core-types = { path = "../../language/move-core/types" } [build-dependencies] prost-build = "0.7.0" diff --git a/language/compiler/bytecode-source-map/Cargo.toml b/language/compiler/bytecode-source-map/Cargo.toml index 3db9a2bc8218..26d08007d8ae 100644 --- a/language/compiler/bytecode-source-map/Cargo.toml +++ b/language/compiler/bytecode-source-map/Cargo.toml @@ -8,7 +8,6 @@ edition = "2018" [dependencies] anyhow = "1.0.38" -diem-types = { path = "../../../types" } diem-workspace-hack = { path = "../../../common/workspace-hack" } move-core-types = { path = "../../move-core/types" } move-ir-types = { path = "../../move-ir/types" } @@ -16,8 +15,7 @@ vm = { path = "../../vm" } bcs = "0.1.2" codespan = "0.8.0" codespan-reporting = "0.8.0" -serde = { version = "1.0.123", default-features = false } +serde = { version = "1.0.125", default-features = false } [features] default = [] -fuzzing = ["diem-types/fuzzing"] diff --git a/language/diem-tools/writeset-transaction-generator/Cargo.toml b/language/diem-tools/writeset-transaction-generator/Cargo.toml index da1b9e8db14e..c74cf168f28b 100644 --- a/language/diem-tools/writeset-transaction-generator/Cargo.toml +++ b/language/diem-tools/writeset-transaction-generator/Cargo.toml @@ -16,9 +16,9 @@ anyhow = "1.0.38" structopt = "0.3.21" tempfile = "3.2.0" handlebars = "3.5.3" -serde = { version = "1.0.123", default-features = false } -serde_json = "1.0.62" -once_cell = "1.7.0" +serde = { version = "1.0.125", default-features = false } +serde_json = "1.0.64" +once_cell = "1.7.2" diem-workspace-hack = { path = "../../../common/workspace-hack" } diem-crypto-derive = { path = "../../../crypto/crypto-derive" } diff --git a/language/diem-vm/Cargo.toml b/language/diem-vm/Cargo.toml index 4f6b307642b3..452580f5a290 100644 --- a/language/diem-vm/Cargo.toml +++ b/language/diem-vm/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] anyhow = "1.0.38" fail = "0.4.0" -once_cell = "1.7.0" +once_cell = "1.7.2" rayon = "1.5.0" mirai-annotations = "1.10.1" @@ -28,8 +28,8 @@ move-core-types = { path = "../move-core/types" } move-vm-runtime = { path = "../move-vm/runtime" } move-vm-types = { path = "../move-vm/types" } vm = { path = "../vm" } -serde_json = "1.0.62" -serde = { version = "1.0.123", default-features = false } +serde_json = "1.0.64" +serde = { version = "1.0.125", default-features = false } [dev-dependencies] proptest = "1.0.0" diff --git a/language/move-core/types/Cargo.toml b/language/move-core/types/Cargo.toml index 2af5ff024eeb..de1733de9147 100644 --- a/language/move-core/types/Cargo.toml +++ b/language/move-core/types/Cargo.toml @@ -1,35 +1,33 @@ [package] name = "move-core-types" -version = "0.1.0" +version = "0.0.1" authors = ["Diem Association "] description = "Core types for Move" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" -publish = false +publish = ["crates-io"] edition = "2018" [dependencies] anyhow = "1.0.38" bcs = "0.1.2" -hex = "0.4.2" +hex = "0.4.3" mirai-annotations = "1.10.1" -once_cell = "1.7.0" +once_cell = "1.7.2" proptest = { version = "1.0.0", default-features = false, optional = true } proptest-derive = { version = "0.3.0", default-features = false, optional = true } rand = "0.8.3" ref-cast = "1.0.6" -serde = { version = "1.0.123", default-features = false } +serde = { version = "1.0.125", default-features = false } serde_bytes = "0.11.5" -thiserror = "1.0.24" - -diem-workspace-hack = { path = "../../../common/workspace-hack" } [dev-dependencies] proptest = "1.0.0" proptest-derive = "0.3.0" regex = "1.4.3" -serde_json = "1.0.62" +serde_json = "1.0.64" +diem-workspace-hack = { path = "../../../common/workspace-hack" } [features] default = [] diff --git a/language/move-ir/types/Cargo.toml b/language/move-ir/types/Cargo.toml index 17d75d51a2eb..782201186195 100644 --- a/language/move-ir/types/Cargo.toml +++ b/language/move-ir/types/Cargo.toml @@ -14,10 +14,9 @@ edition = "2018" [dependencies] anyhow = "1.0.38" codespan = { version = "0.8.0", features = ["serialization"] } -serde = { version = "1.0.123", features = ["derive"] } -hex = "0.4.2" -once_cell = "1.7.0" +serde = { version = "1.0.125", features = ["derive"] } +hex = "0.4.3" +once_cell = "1.7.2" -diem-types = { path = "../../../types" } diem-workspace-hack = { path = "../../../common/workspace-hack" } move-core-types = { path = "../../move-core/types" } diff --git a/language/move-model/Cargo.toml b/language/move-model/Cargo.toml index e5cff7b26bf0..5b702df5d082 100644 --- a/language/move-model/Cargo.toml +++ b/language/move-model/Cargo.toml @@ -11,7 +11,6 @@ license = "Apache-2.0" move-lang = { path = "../move-lang" } bytecode-verifier = { path = "../bytecode-verifier" } vm = { path = "../vm" } -diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } bytecode-source-map = { path = "../compiler/bytecode-source-map" } move-ir-types = { path = "../move-ir/types" } @@ -22,11 +21,11 @@ codespan = "0.8.0" codespan-reporting = "0.8.0" itertools = "0.10.0" log = "0.4.14" -num = "0.3.0" -once_cell = "1.7.0" +num = "0.4.0" +once_cell = "1.7.2" regex = "1.4.3" anyhow = "1.0.38" -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } [dev-dependencies] datatest-stable = { path = "../../common/datatest-stable" } diff --git a/language/move-prover/Cargo.toml b/language/move-prover/Cargo.toml index e6b0e79051a8..5b3a4fd606f6 100644 --- a/language/move-prover/Cargo.toml +++ b/language/move-prover/Cargo.toml @@ -14,9 +14,8 @@ move-model = { path = "../move-model" } docgen = { path = "docgen" } abigen = { path = "abigen" } errmapgen = { path = "errmapgen" } -bytecode = { path = "bytecode"} +bytecode = { path = "bytecode" } vm = { path = "../vm" } -diem-types = { path = "../../types" } diem-temppath = { path = "../../common/temppath" } diem-workspace-hack = { path = "../../common/workspace-hack" } bytecode-source-map = { path = "../compiler/bytecode-source-map" } @@ -30,18 +29,18 @@ codespan = "0.8.0" codespan-reporting = "0.8.0" futures = "0.3.12" handlebars = "3.5.3" -hex = "0.4.2" +hex = "0.4.3" itertools = "0.10.0" log = { version = "0.4.14", features = ["serde"] } -num = "0.3.0" +num = "0.4.0" pretty = "0.10.0" rand = "0.8.3" regex = "1.4.3" -serde = { version = "1.0.123", features = ["derive"] } -serde_json = "1.0.62" +serde = { version = "1.0.125", features = ["derive"] } +serde_json = "1.0.64" simplelog = "0.9.0" -once_cell = "1.7.0" -tokio = { version = "1.2.0", features = ["full"] } +once_cell = "1.7.2" +tokio = { version = "1.3.0", features = ["full"] } toml = "0.5.8" [dev-dependencies] diff --git a/language/move-prover/abigen/Cargo.toml b/language/move-prover/abigen/Cargo.toml index 7a054c8f6b8b..1c8d53fcc207 100644 --- a/language/move-prover/abigen/Cargo.toml +++ b/language/move-prover/abigen/Cargo.toml @@ -12,13 +12,14 @@ move-model = { path = "../../move-model" } diem-workspace-hack = { path = "../../../common/workspace-hack" } diem-types = { path = "../../../types" } move-core-types = { path = "../../move-core/types" } +bytecode-verifier = { path = "../../bytecode-verifier" } bcs = "0.1.2" # external dependencies log = "0.4.14" anyhow = "1.0.38" heck = "0.3.2" -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } [dev-dependencies] codespan-reporting = "0.8.0" diff --git a/language/move-prover/boogie-backend/Cargo.toml b/language/move-prover/boogie-backend/Cargo.toml index 5150ae2df95b..a2ed00b07835 100644 --- a/language/move-prover/boogie-backend/Cargo.toml +++ b/language/move-prover/boogie-backend/Cargo.toml @@ -13,21 +13,20 @@ bytecode = { path = "../bytecode" } move-model = { path = "../../move-model" } vm = { path = "../../vm" } diem-workspace-hack = { path = "../../../common/workspace-hack" } -num = "0.3.0" +num = "0.4.0" itertools = "0.10.0" -diem-types = { path = "../../../types" } move-core-types = { path = "../../move-core/types" } log = "0.4.14" -serde = { version = "1.0.123", features = ["derive"] } -serde_json = "1.0.62" +serde = { version = "1.0.125", features = ["derive"] } +serde_json = "1.0.64" anyhow = "1.0.37" -once_cell = "1.7.0" +once_cell = "1.7.2" pretty = "0.10.0" regex = "1.4.3" rand = "0.8.3" futures = "0.3.12" handlebars = "3.5.3" -tokio = { version = "1.2.0", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } codespan = "0.8.0" codespan-reporting = "0.8.0" diff --git a/language/move-prover/bytecode/Cargo.toml b/language/move-prover/bytecode/Cargo.toml index fc07cbe8add6..c473e776ead3 100644 --- a/language/move-prover/bytecode/Cargo.toml +++ b/language/move-prover/bytecode/Cargo.toml @@ -16,14 +16,15 @@ bytecode-verifier = { path = "../../bytecode-verifier" } borrow-graph = { path = "../../borrow-graph" } ir-to-bytecode = { path = "../../compiler/ir-to-bytecode" } diem-workspace-hack = { path = "../../../common/workspace-hack" } -num = "0.3.0" +num = "0.4.0" itertools = "0.10.0" diem-types = { path = "../../../types" } move-core-types = { path = "../../move-core/types" } log = "0.4.14" -serde = { version = "1.0.123", features = ["derive"] } -serde_json = "1.0.62" -once_cell = "1.7.0" +serde = { version = "1.0.125", features = ["derive"] } +serde_json = "1.0.64" +once_cell = "1.7.2" +petgraph = "0.5.1" [dev-dependencies] datatest-stable = { path = "../../../common/datatest-stable" } diff --git a/language/move-prover/docgen/Cargo.toml b/language/move-prover/docgen/Cargo.toml index f18d4959cc3c..f027d655f7ff 100644 --- a/language/move-prover/docgen/Cargo.toml +++ b/language/move-prover/docgen/Cargo.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" [dependencies] # diem dependencies move-model = { path = "../../move-model" } -bytecode = { path = "../bytecode"} +bytecode = { path = "../bytecode" } diem-workspace-hack = { path = "../../../common/workspace-hack" } # external dependencies @@ -17,11 +17,11 @@ codespan = "0.8.0" codespan-reporting = "0.8.0" itertools = "0.10.0" log = "0.4.14" -num = "0.3.0" +num = "0.4.0" regex = "1.4.3" anyhow = "1.0.38" -serde = { version = "1.0.123", features = ["derive"] } -once_cell = "1.7.0" +serde = { version = "1.0.125", features = ["derive"] } +once_cell = "1.7.2" [dev-dependencies] move-prover = { path = ".." } diff --git a/language/move-prover/errmapgen/Cargo.toml b/language/move-prover/errmapgen/Cargo.toml index 2032b2d187f3..e73b1ae52f70 100644 --- a/language/move-prover/errmapgen/Cargo.toml +++ b/language/move-prover/errmapgen/Cargo.toml @@ -10,14 +10,13 @@ license = "Apache-2.0" # diem dependencies move-model = { path = "../../move-model" } diem-workspace-hack = { path = "../../../common/workspace-hack" } -diem-types = { path = "../../../types" } move-core-types = { path = "../../move-core/types" } bcs = "0.1.2" # external dependencies log = "0.4.14" anyhow = "1.0.38" -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } [dev-dependencies] codespan-reporting = "0.8.0" diff --git a/language/move-vm/types/Cargo.toml b/language/move-vm/types/Cargo.toml index 115705795f66..46280dd6e28c 100644 --- a/language/move-vm/types/Cargo.toml +++ b/language/move-vm/types/Cargo.toml @@ -11,10 +11,10 @@ edition = "2018" [dependencies] mirai-annotations = "1.10.1" -once_cell = "1.7.0" +once_cell = "1.7.2" proptest = { version = "1.0.0", optional = true } sha2 = "0.9.3" -serde = { version = "1.0.123", features = ["derive", "rc"] } +serde = { version = "1.0.125", features = ["derive", "rc"] } smallvec = "1.6.1" bcs = "0.1.2" diff --git a/language/tools/move-coverage/Cargo.toml b/language/tools/move-coverage/Cargo.toml index f9b705ef1ca2..64d8ace12584 100644 --- a/language/tools/move-coverage/Cargo.toml +++ b/language/tools/move-coverage/Cargo.toml @@ -10,10 +10,10 @@ publish = false edition = "2018" [dependencies] -once_cell = "1.7.0" +once_cell = "1.7.2" petgraph = "0.5.1" structopt = "0.3.21" -serde = { version = "1.0.123", default-features = false } +serde = { version = "1.0.125", default-features = false } anyhow = "1.0.38" codespan = { version = "0.8.0", features = ["serialization"] } colored = "2.0.0" diff --git a/language/tools/resource-viewer/Cargo.toml b/language/tools/resource-viewer/Cargo.toml index 6ddeab921409..d41796e318cd 100644 --- a/language/tools/resource-viewer/Cargo.toml +++ b/language/tools/resource-viewer/Cargo.toml @@ -19,9 +19,9 @@ move-vm-runtime = { path = "../../move-vm/runtime" } move-vm-types = { path = "../../move-vm/types" } compiled-stdlib = { path = "../../diem-framework/compiled" } vm = { path = "../../vm" } -serde_json = "1.0.62" -serde = { version = "1.0.123", features = ["derive", "rc"] } +serde_json = "1.0.64" +serde = { version = "1.0.125", features = ["derive", "rc"] } anyhow = "1.0.38" -once_cell = "1.7.0" -hex = "0.4.2" +once_cell = "1.7.2" +hex = "0.4.3" diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml index ddd4388dcc31..777c5d44a48b 100644 --- a/mempool/Cargo.toml +++ b/mempool/Cargo.toml @@ -14,12 +14,12 @@ anyhow = "1.0.38" fail = "0.4.0" futures = "0.3.12" itertools = "0.10.0" -once_cell = "1.7.0" +once_cell = "1.7.2" proptest = { version = "1.0.0", optional = true } rayon = "1.4.1" -serde = { version = "1.0.123", default-features = false } -tokio = { version = "1.2.0", features = ["full"] } -tokio-stream = "0.1.3" +serde = { version = "1.0.125", default-features = false } +tokio = { version = "1.3.0", features = ["full"] } +tokio-stream = "0.1.4" bounded-executor = { path = "../common/bounded-executor" } channel = { path = "../common/channel" } @@ -37,7 +37,7 @@ mirai-annotations = "1.10.1" network = { path = "../network" } rand = "0.8.3" netcore = { path = "../network/netcore" } -serde_json = "1.0.62" +serde_json = "1.0.64" short-hex-str = { path = "../common/short-hex-str" } storage-interface = { path = "../storage/storage-interface" } subscription-service = { path = "../common/subscription-service" } @@ -46,6 +46,7 @@ vm-validator = { path = "../vm-validator" } storage-service = { path = "../storage/storage-service", optional = true } [dev-dependencies] +enum_dispatch = "0.3.5" proptest = "1.0.0" diem-config = { path = "../config", features = ["fuzzing"] } diff --git a/network/Cargo.toml b/network/Cargo.toml index db21e94cc4db..8587d0fd30c6 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -14,20 +14,20 @@ anyhow = "1.0.38" bytes = { version = "1.0.1", features = ["serde"] } futures = "0.3.12" futures-util = "0.3.12" -hex = "0.4.2" -once_cell = "1.7.0" +hex = "0.4.3" +once_cell = "1.7.2" pin-project = "1.0.5" proptest = { version = "1.0.0", default-features = true, optional = true } proptest-derive = { version = "0.3.0", optional = true } rand = { version = "0.8.3", features = ["small_rng"] } rand_core = { version = "0.6.2", optional = true } -serde = { version = "1.0.123", default-features = false } +serde = { version = "1.0.125", default-features = false } serde_bytes = "0.11.5" thiserror = "1.0.24" -tokio = { version = "1.2.0", features = ["full"] } -tokio-retry = "0.2.0" -tokio-stream = "0.1.3" -tokio-util = { version = "0.6.3", features = ["compat", "codec"] } +tokio = { version = "1.3.0", features = ["full"] } +tokio-retry = "0.3.0" +tokio-stream = "0.1.4" +tokio-util = { version = "0.6.4", features = ["compat", "codec"] } bitvec = { path = "../common/bitvec", package = "diem-bitvec" } channel = { path = "../common/channel" } diff --git a/network/builder/Cargo.toml b/network/builder/Cargo.toml index 990ff6fd22af..861f46e122fb 100644 --- a/network/builder/Cargo.toml +++ b/network/builder/Cargo.toml @@ -14,8 +14,8 @@ edition = "2018" [dependencies] futures = "0.3.12" rand = "0.8.3" -serde = { version = "1.0.123", default-features = false } -tokio = { version = "1.2.0", features = ["full"] } +serde = { version = "1.0.125", default-features = false } +tokio = { version = "1.3.0", features = ["full"] } channel = { path = "../../common/channel" } bcs = "0.1.2" diff --git a/network/netcore/Cargo.toml b/network/netcore/Cargo.toml index 8214b38cbf83..e0d191102405 100644 --- a/network/netcore/Cargo.toml +++ b/network/netcore/Cargo.toml @@ -13,9 +13,9 @@ edition = "2018" bytes = "1.0.1" futures = "0.3.12" pin-project = "1.0.5" -serde = { version = "1.0.123", default-features = false } -tokio = { version = "1.2.0", features = ["full"] } -tokio-util = { version = "0.6.3", features = ["compat"] } +serde = { version = "1.0.125", default-features = false } +tokio = { version = "1.3.0", features = ["full"] } +tokio-util = { version = "0.6.4", features = ["compat"] } url = { version = "2.2.1" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/sdk/client/Cargo.toml b/sdk/client/Cargo.toml index a1ef2edfa2fc..7715e9727fca 100644 --- a/sdk/client/Cargo.toml +++ b/sdk/client/Cargo.toml @@ -1,33 +1,35 @@ [package] name = "diem-client" -version = "0.1.0" +version = "0.0.1" authors = ["Diem Association "] description = "Diem JSON-RPC client" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" -publish = false +publish = ["crates-io"] edition = "2018" [features] default = ["async", "blocking"] -blocking = ["ureq", "proxy"] +blocking = ["ureq", "ipnet"] async = ["reqwest", "tokio"] [dependencies] anyhow = "1.0.38" bcs = "0.1.2" -hex = "0.4.2" -serde = { version = "1.0.123", features = ["derive"] } -serde_json = "1.0.62" +hex = "0.4.3" +serde = { version = "1.0.125", features = ["derive"] } +serde_json = "1.0.64" -diem-crypto = { path = "../../crypto/crypto" } -diem-json-rpc-types = { path = "../../json-rpc/types" } -diem-types = { path = "../../types" } -diem-workspace-hack = { path = "../../common/workspace-hack" } +diem-crypto = { path = "../../crypto/crypto", version = "0.0.1" } +diem-json-rpc-types = { path = "../../json-rpc/types", version = "0.0.1" } +diem-types = { path = "../../types", version = "0.0.1" } # Optional Dependencies -reqwest = { version = "0.11.1", features = ["json"], optional = true } -tokio = { version = "1.2.0", features = ["time"], default_features = false, optional = true } +reqwest = { version = "0.11.2", features = ["json"], optional = true } +tokio = { version = "1.3.0", features = ["time"], default_features = false, optional = true } ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false, optional = true } -proxy = { path = "../../common/proxy", optional = true } +ipnet = { version = "2.3", optional = true } + +[dev-dependencies] +diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/secure/key-manager/Cargo.toml b/secure/key-manager/Cargo.toml index 12e96ccb40a7..69966d4ea8b5 100644 --- a/secure/key-manager/Cargo.toml +++ b/secure/key-manager/Cargo.toml @@ -12,8 +12,8 @@ publish = false [dependencies] anyhow = "1.0.38" bcs = "0.1.2" -once_cell = "1.7.0" -serde = { version = "1.0.123", features = ["rc"], default-features = false } +once_cell = "1.7.2" +serde = { version = "1.0.125", features = ["rc"], default-features = false } thiserror = "1.0.24" crash-handler = { path = "../../common/crash-handler" } @@ -27,12 +27,12 @@ diem-secure-storage = { path = "../storage" } diem-time-service = { path = "../../common/time-service" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } -transaction-builder-generated = { path = "../../client/transaction-builder" } +diem-transaction-builder = { path = "../../client/transaction-builder" } [dev-dependencies] futures = "0.3.12" rand = "0.8.3" -tokio = { version = "1.2.0", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } executor = { path = "../../execution/executor" } executor-test-helpers = { path = "../../execution/executor-test-helpers" } diff --git a/secure/net/Cargo.toml b/secure/net/Cargo.toml index faa13e11308a..b6f852f8467b 100644 --- a/secure/net/Cargo.toml +++ b/secure/net/Cargo.toml @@ -10,8 +10,8 @@ publish = false edition = "2018" [dependencies] -once_cell = "1.7.0" -serde = { version = "1.0.123", features = ["rc"], default-features = false } +once_cell = "1.7.2" +serde = { version = "1.0.125", features = ["rc"], default-features = false } thiserror = "1.0.24" diem-logger = { path = "../../common/logger" } diff --git a/secure/storage/Cargo.toml b/secure/storage/Cargo.toml index 8b0074def2d1..3972b968d888 100644 --- a/secure/storage/Cargo.toml +++ b/secure/storage/Cargo.toml @@ -14,8 +14,8 @@ base64 = "0.13.0" chrono = "0.4.19" enum_dispatch = "0.3.5" rand = "0.8.3" -serde = { version = "1.0.123", features = ["rc"], default-features = false } -serde_json = "1.0.62" +serde = { version = "1.0.125", features = ["rc"], default-features = false } +serde_json = "1.0.64" thiserror = "1.0.24" bcs = "0.1.2" diff --git a/secure/storage/github/Cargo.toml b/secure/storage/github/Cargo.toml index 7d332ffe9823..7919366cce4d 100644 --- a/secure/storage/github/Cargo.toml +++ b/secure/storage/github/Cargo.toml @@ -10,8 +10,8 @@ publish = false edition = "2018" [dependencies] -serde = { version = "1.0.123", features = ["derive"], default-features = false } -serde_json = "1.0.62" +serde = { version = "1.0.125", features = ["derive"], default-features = false } +serde_json = "1.0.64" thiserror = "1.0.24" ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false } diff --git a/secure/storage/vault/Cargo.toml b/secure/storage/vault/Cargo.toml index b8d66dabbd65..c93958ab814b 100644 --- a/secure/storage/vault/Cargo.toml +++ b/secure/storage/vault/Cargo.toml @@ -12,11 +12,11 @@ edition = "2018" [dependencies] base64 = "0.13.0" chrono = "0.4.19" -once_cell = "1.7.0" +once_cell = "1.7.2" proptest = { version = "1.0.0", optional = true } native-tls = "0.2.7" -serde = { version = "1.0.123", features = ["derive"], default-features = false } -serde_json = "1.0.62" +serde = { version = "1.0.125", features = ["derive"], default-features = false } +serde_json = "1.0.64" thiserror = "1.0.24" ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false } diff --git a/state-sync/Cargo.toml b/state-sync/Cargo.toml index c217fcfae1f3..a665c7c358cf 100644 --- a/state-sync/Cargo.toml +++ b/state-sync/Cargo.toml @@ -10,18 +10,17 @@ publish = false edition = "2018" [dependencies] -anyhow = "1.0.38" bcs = "0.1.2" fail = "0.4.0" futures = "0.3.12" itertools = { version = "0.10.0", default-features = false } -once_cell = "1.7.0" +once_cell = "1.7.2" proptest = { version = "1.0.0", optional = true } rand = "0.8.3" -serde = { version = "1.0.123", default-features = false } +serde = { version = "1.0.125", default-features = false } thiserror = "1.0.24" -tokio = { version = "1.2.0", features = ["full"] } -tokio-stream = "0.1.3" +tokio = { version = "1.3.0", features = ["full"] } +tokio-stream = "0.1.4" channel = { path = "../common/channel" } diem-config = { path = "../config" } diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml index 6c214b39ac55..3b3898653432 100644 --- a/storage/backup/backup-cli/Cargo.toml +++ b/storage/backup/backup-cli/Cargo.toml @@ -11,24 +11,24 @@ edition = "2018" [dependencies] anyhow = "1.0.38" async-trait = "0.1.42" -byteorder = "1.4.2" +byteorder = "1.4.3" bytes = "1.0.1" futures = "0.3.12" -hex = "0.4.2" +hex = "0.4.3" itertools = "0.10.0" num_cpus = "1.13.0" -once_cell = "1.7.0" +once_cell = "1.7.2" pin-project = "1.0.5" rand = "0.8.3" regex = "1.4.3" -reqwest = { version = "0.11.1", features = ["stream"], default-features = false } -serde = { version = "1.0.123", features = ["derive"] } -serde_json = "1.0.62" +reqwest = { version = "0.11.2", features = ["stream"], default-features = false } +serde = { version = "1.0.125", features = ["derive"] } +serde_json = "1.0.64" structopt = "0.3.21" toml = "0.5.8" -tokio = { version = "1.2.0", features = ["full"] } -tokio-stream = "0.1.3" -tokio-util = { version = "0.6.3", features = ["compat"] } +tokio = { version = "1.3.0", features = ["full"] } +tokio-stream = "0.1.4" +tokio-util = { version = "0.6.4", features = ["compat"] } executor = { path = "../../../execution/executor" } executor-test-helpers = { path = "../../../execution/executor-test-helpers", optional = true } @@ -40,6 +40,7 @@ diem-crypto = { path = "../../../crypto/crypto" } diem-infallible = { path = "../../../common/infallible" } diem-logger = { path = "../../../common/logger" } diem-secure-push-metrics = { path = "../../../secure/push-metrics" } +diem-temppath = { path = "../../../common/temppath" } diem-types = { path = "../../../types" } diem-vm = { path = "../../../language/diem-vm" } diem-workspace-hack = { path = "../../../common/workspace-hack" } @@ -55,7 +56,6 @@ executor-test-helpers = { path = "../../../execution/executor-test-helpers" } diemdb = { path = "../../diemdb", features = ["fuzzing"] } diem-config = { path = "../../../config" } diem-proptest-helpers = { path = "../../../common/proptest-helpers" } -diem-temppath = { path = "../../../common/temppath" } storage-interface = { path = "../../storage-interface" } [features] diff --git a/storage/backup/backup-service/Cargo.toml b/storage/backup/backup-service/Cargo.toml index f5a171e39575..7b93d1e99989 100644 --- a/storage/backup/backup-service/Cargo.toml +++ b/storage/backup/backup-service/Cargo.toml @@ -13,9 +13,9 @@ anyhow = "1.0.38" bytes = "1.0.1" futures = "0.3.12" hyper = "0.14.4" -once_cell = "1.7.0" -serde = { version = "1.0.123", default-features = false } -tokio = { version = "1.2.0", features = ["full"] } +once_cell = "1.7.2" +serde = { version = "1.0.125", default-features = false } +tokio = { version = "1.3.0", features = ["full"] } warp = "0.3.0" bcs = "0.1.2" @@ -32,7 +32,7 @@ diemdb = { path = "../../diemdb", features = ["fuzzing"] } diem-config = { path = "../../../config" } diem-temppath = { path = "../../../common/temppath" } -reqwest = { version = "0.11.1", features = ["blocking", "json"], default_features = false } +reqwest = { version = "0.11.2", features = ["blocking", "json"], default_features = false } [features] fuzzing = ["diemdb/fuzzing"] diff --git a/storage/diemdb/Cargo.toml b/storage/diemdb/Cargo.toml index 60a6cc66b0bb..bc13015c4b08 100644 --- a/storage/diemdb/Cargo.toml +++ b/storage/diemdb/Cargo.toml @@ -12,14 +12,14 @@ edition = "2018" [dependencies] anyhow = "1.0.38" arc-swap = "1.2.0" -byteorder = "1.4.2" +byteorder = "1.4.3" itertools = "0.10.0" -once_cell = "1.7.0" +once_cell = "1.7.2" num-derive = "0.3.3" num-traits = "0.2.14" proptest = { version = "1.0.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } -serde = "1.0.123" +serde = "1.0.125" thiserror = "1.0.24" accumulator = { path = "../accumulator" } diff --git a/storage/diemsum/Cargo.toml b/storage/diemsum/Cargo.toml index 45bb9b3137e9..916016decda3 100644 --- a/storage/diemsum/Cargo.toml +++ b/storage/diemsum/Cargo.toml @@ -12,8 +12,8 @@ edition = "2018" [dependencies] anyhow = "1.0.38" structopt = "0.3.21" -serde = "1.0.123" -serde_json = "1.0.62" +serde = "1.0.125" +serde_json = "1.0.64" diemdb = { path = "../diemdb", features = ["diemsum"] } diem-crypto = { path = "../../crypto/crypto" } diff --git a/storage/jellyfish-merkle/Cargo.toml b/storage/jellyfish-merkle/Cargo.toml index 9ab752dd8197..54022814a34d 100644 --- a/storage/jellyfish-merkle/Cargo.toml +++ b/storage/jellyfish-merkle/Cargo.toml @@ -11,20 +11,22 @@ edition = "2018" [dependencies] anyhow = "1.0.38" -byteorder = "1.4.2" +byteorder = "1.4.3" mirai-annotations = "1.10.1" num-derive = "0.3.3" num-traits = "0.2.14" +once_cell = "1.7.2" proptest = { version = "1.0.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } rand = { version = "0.8.3", optional = true } -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } thiserror = "1.0.24" bcs = "0.1.2" diem-crypto = { path = "../../crypto/crypto" } diem-crypto-derive = { path = "../../crypto/crypto-derive" } diem-infallible = { path = "../../common/infallible" } +diem-metrics = { path = "../../common/metrics" } diem-nibble = { path = "../../common/nibble" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/storage/storage-client/Cargo.toml b/storage/storage-client/Cargo.toml index 49b3ac7d6f17..ce1467da22dc 100644 --- a/storage/storage-client/Cargo.toml +++ b/storage/storage-client/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.38" -serde = "1.0.123" +serde = "1.0.125" bcs = "0.1.2" diem-crypto = { path = "../../crypto/crypto" } diff --git a/storage/storage-interface/Cargo.toml b/storage/storage-interface/Cargo.toml index 028c6e8348d8..dabb9a3a9d2e 100644 --- a/storage/storage-interface/Cargo.toml +++ b/storage/storage-interface/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] anyhow = "1.0.38" itertools = "0.10.0" -serde = { version = "1.0.123", default-features = false } +serde = { version = "1.0.125", default-features = false } thiserror = "1.0.24" parking_lot = "0.11.1" diff --git a/testsuite/cli/Cargo.toml b/testsuite/cli/Cargo.toml index c5995770ff4a..bcbc5e5b2784 100644 --- a/testsuite/cli/Cargo.toml +++ b/testsuite/cli/Cargo.toml @@ -12,16 +12,16 @@ edition = "2018" [dependencies] anyhow = "1.0.38" chrono = "0.4.19" -hex = "0.4.2" +hex = "0.4.3" proptest = { version = "1.0.0", optional = true } -rustyline = "7.1.0" +rustyline = "8.0.0" rust_decimal = "1.10.3" num-traits = "0.2.14" -once_cell = "1.7.0" -reqwest = { version = "0.11.1", features = ["blocking", "json"] } -serde = { version = "1.0.123", features = ["derive"] } +once_cell = "1.7.2" +reqwest = { version = "0.11.2", features = ["blocking", "json"] } +serde = { version = "1.0.125", features = ["derive"] } structopt = "0.3.21" -tokio = { version = "1.2.0", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } walkdir = "2.3.1" diem-config = { path = "../../config" } diff --git a/testsuite/cli/diem-wallet/Cargo.toml b/testsuite/cli/diem-wallet/Cargo.toml index 4df779b3916b..2f2b80ae355f 100644 --- a/testsuite/cli/diem-wallet/Cargo.toml +++ b/testsuite/cli/diem-wallet/Cargo.toml @@ -12,11 +12,11 @@ edition = "2018" [dependencies] anyhow = "1.0.38" rand = "0.8.3" -hex = "0.4.2" +hex = "0.4.3" hmac = "0.10.1" -byteorder = "1.4.2" +byteorder = "1.4.3" pbkdf2 = "0.7.3" -serde = "1.0.123" +serde = "1.0.125" sha2 = "0.9.3" thiserror = "1.0.24" ed25519-dalek = { version = "0.1.0", package = "ed25519-dalek-fiat", default-features = false, features = ["std", "fiat_u64_backend"] } diff --git a/testsuite/cluster-test/Cargo.toml b/testsuite/cluster-test/Cargo.toml index db2922ae6523..aaabfa37fabc 100644 --- a/testsuite/cluster-test/Cargo.toml +++ b/testsuite/cluster-test/Cargo.toml @@ -12,16 +12,16 @@ edition = "2018" [dependencies] anyhow = "1.0.38" flate2 = { version = "1.0.20", features = ["rust_backend"], default-features = false } -hex = "0.4.2" +hex = "0.4.3" itertools = "0.10.0" -once_cell = "1.7.0" +once_cell = "1.7.2" rand = "0.8.3" regex = { version = "1.4.3", default-features = false, features = ["std", "perf"] } -reqwest = { version = "0.11.1", features = ["blocking", "json"] } -serde_json = "1.0.62" +reqwest = { version = "0.11.2", features = ["blocking", "json"] } +serde_json = "1.0.64" serde_yaml = "0.8.17" termion = "1.5.6" -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } structopt = "0.3.21" rusoto_core = "0.46.0" rusoto_autoscaling = "0.46.0" @@ -55,6 +55,7 @@ diem-time-service = { path = "../../common/time-service" } diem-trace = {path = "../../common/trace"} diem-types = { path = "../../types", features = ["fuzzing"] } diem-workspace-hack = { path = "../../common/workspace-hack" } +move-core-types = { path = "../../language/move-core/types" } network = { path = "../../network" } network-builder = { path = "../../network/builder" } seed-peer-generator = { path = "../../config/seed-peer-generator" } @@ -62,9 +63,9 @@ state-sync = { path = "../../state-sync" } transaction-builder = { path = "../../language/transaction-builder" } futures = "0.3.12" -tokio = { version = "1.2.0", features = ["full"] } +tokio = { version = "1.3.0", features = ["full"] } async-trait = "0.1.42" -kube = "0.50.1" +kube = "0.51.0" k8s-openapi = { version = "0.11.0", default-features = false, features = ["v1_15"] } diff --git a/testsuite/generate-format/Cargo.toml b/testsuite/generate-format/Cargo.toml index 4af08c7c8c79..91b7457f2545 100644 --- a/testsuite/generate-format/Cargo.toml +++ b/testsuite/generate-format/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] rand = "0.8.3" -serde = { version = "1.0.123", features = ["derive"] } +serde = { version = "1.0.125", features = ["derive"] } serde-reflection = "0.3.2" serde_yaml = "0.8.17" structopt = "0.3.21" diff --git a/types/Cargo.toml b/types/Cargo.toml index d840d3345153..3c02b32ecba2 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "diem-types" -version = "0.1.0" +version = "0.0.1" authors = ["Diem Association "] description = "Diem types" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" -publish = false +publish = ["crates-io"] edition = "2018" [dependencies] @@ -14,33 +14,33 @@ aes-gcm = "0.8.0" anyhow = "1.0.38" bytes = "1.0.1" chrono = { version = "0.4.19", default-features = false, features = ["clock"] } -hex = "0.4.2" +hex = "0.4.3" itertools = { version = "0.10.0", default-features = false } -once_cell = "1.7.0" +once_cell = "1.7.2" mirai-annotations = "1.10.1" proptest = { version = "1.0.0", optional = true } proptest-derive = { version = "0.3.0", default-features = false, optional = true } rand = "0.8.3" -serde = { version = "1.0.123", default-features = false } -serde_json = "1.0.62" +serde = { version = "1.0.125", default-features = false } +serde_json = "1.0.64" serde_bytes = "0.11.5" thiserror = "1.0.24" tiny-keccak = { version = "2.0.2", default-features = false, features = ["sha3"] } bcs = "0.1.2" -diem-crypto = { path = "../crypto/crypto" } -diem-crypto-derive = { path = "../crypto/crypto-derive" } -diem-workspace-hack = { path = "../common/workspace-hack" } -move-core-types = { path = "../language/move-core/types" } +diem-crypto = { path = "../crypto/crypto", version = "0.0.1" } +diem-crypto-derive = { path = "../crypto/crypto-derive", version = "0.0.1" } +move-core-types = { path = "../language/move-core/types", version = "0.0.1" } [dev-dependencies] regex = "1.4.3" proptest = "1.0.0" proptest-derive = "0.3.0" -serde_json = "1.0.62" +serde_json = "1.0.64" diem-crypto = { path = "../crypto/crypto", features = ["fuzzing"] } move-core-types = { path = "../language/move-core/types", features = ["fuzzing"] } +diem-workspace-hack = { path = "../common/workspace-hack" } [features] default = []