diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ba598a566b2..c5feb45c8cc 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -32,11 +32,13 @@ jobs: platform: x86_64 target: x86_64-apple-darwin name: release_macos.tar.gz + - os: macOS-latest + platform: arm64 + target: aarch64-apple-darwin + name: release_macos_aarch64.tar.gz exclude: - os: windows-latest platform: arm64 - - os: macOS-latest - platform: arm64 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 145061f0355..a6a2b092f2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -152,37 +152,6 @@ jobs: steps: - run: exit 0 - # Code documentation and coverage will be run only on main branch - coverage: - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' - steps: - - uses: actions/checkout@v2 - with: - submodules: "recursive" - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true - - uses: actions-rs/cargo@v1 - with: - command: clean - - uses: actions-rs/cargo@v1 - with: - command: test - args: --features testing --no-fail-fast - env: - CARGO_INCREMENTAL: "0" - RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests" - RUSTDOCFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests" - - id: coverage - uses: actions-rs/grcov@v0.1 - - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: ${{ steps.coverage.outputs.report }} - doc: runs-on: ubuntu-latest if: github.ref == 'refs/heads/main' diff --git a/Cargo.lock b/Cargo.lock index a8b2df56a45..84c817d2008 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,9 +29,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe0133578c0986e1fe3dfcd4af1cc5b2dd6c3dbf534d69916ce16a2701d40ba" +checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ "cfg-if 1.0.0", "cipher", @@ -58,7 +58,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "once_cell", "version_check", ] @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "arrayref" @@ -161,15 +161,15 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64ct" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" [[package]] name = "bindgen" @@ -204,7 +204,7 @@ checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", - "serde 1.0.145", + "serde 1.0.147", "tap", "wyz", ] @@ -220,7 +220,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "constant_time_eq", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -261,9 +261,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "bytecheck" @@ -311,9 +311,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.73" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" dependencies = [ "jobserver", ] @@ -394,7 +394,7 @@ dependencies = [ "lazy_static", "nom 5.1.2", "rust-ini", - "serde 1.0.145", + "serde 1.0.147", "serde-hjson", "serde_json", "toml", @@ -602,9 +602,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", "syn", @@ -634,9 +634,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02" +checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" dependencies = [ "darling_core", "darling_macro", @@ -644,9 +644,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f" +checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" dependencies = [ "fnv", "ident_case", @@ -657,9 +657,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5" +checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ "darling_core", "quote", @@ -703,6 +703,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "dialoguer" +version = "0.10.2" +source = "git+https://github.com/mitsuhiko/dialoguer#4c1361fda198ec99a9a4a643b6c839ee76987c4c" +dependencies = [ + "console", + "tempfile", + "zeroize", +] + [[package]] name = "diff" version = "0.1.13" @@ -720,9 +730,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", "crypto-common", @@ -805,7 +815,7 @@ dependencies = [ "ed25519", "merlin", "rand 0.7.3", - "serde 1.0.145", + "serde 1.0.147", "sha2 0.9.9", "zeroize", ] @@ -849,7 +859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5a56d54c8dd9b3ad34752ed197a4eb2a6601bc010808eb097a04a58ae4c43e1" dependencies = [ "enum-map-derive", - "serde 1.0.145", + "serde 1.0.147", ] [[package]] @@ -890,7 +900,7 @@ version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54558e0ba96fbe24280072642eceb9d7d442e32c7ec0ea9e7ecd7b4ea2cf4e11" dependencies = [ - "serde 1.0.145", + "serde 1.0.147", ] [[package]] @@ -949,9 +959,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" dependencies = [ "futures-channel", "futures-core", @@ -964,9 +974,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", "futures-sink", @@ -974,15 +984,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-executor" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" dependencies = [ "futures-core", "futures-task", @@ -992,15 +1002,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-macro" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", @@ -1009,15 +1019,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" [[package]] name = "futures-task" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-timer" @@ -1027,9 +1037,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ "futures 0.1.31", "futures-channel", @@ -1067,9 +1077,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if 1.0.0", "libc", @@ -1164,7 +1174,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -1203,9 +1213,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ "bytes", "futures-channel", @@ -1245,13 +1255,13 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde 1.0.145", + "serde 1.0.147", ] [[package]] @@ -1311,13 +1321,13 @@ version = "18.0.0" source = "git+https://github.com/massalabs/jsonrpc#99733977df27069d64b6e1bcda7192281648fc22" dependencies = [ "derive_more", - "futures 0.3.24", + "futures 0.3.25", "hyper", "hyper-tls", "jsonrpc-core", "jsonrpc-pubsub", "log", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "tokio", ] @@ -1327,11 +1337,11 @@ name = "jsonrpc-core" version = "18.0.0" source = "git+https://github.com/massalabs/jsonrpc#99733977df27069d64b6e1bcda7192281648fc22" dependencies = [ - "futures 0.3.24", + "futures 0.3.25", "futures-executor", "futures-util", "log", - "serde 1.0.145", + "serde 1.0.147", "serde_derive", "serde_json", ] @@ -1341,7 +1351,7 @@ name = "jsonrpc-core-client" version = "18.0.0" source = "git+https://github.com/massalabs/jsonrpc#99733977df27069d64b6e1bcda7192281648fc22" dependencies = [ - "futures 0.3.24", + "futures 0.3.25", "jsonrpc-client-transports", ] @@ -1361,7 +1371,7 @@ name = "jsonrpc-http-server" version = "18.0.0" source = "git+https://github.com/massalabs/jsonrpc#99733977df27069d64b6e1bcda7192281648fc22" dependencies = [ - "futures 0.3.24", + "futures 0.3.25", "hyper", "jsonrpc-core", "jsonrpc-server-utils", @@ -1376,13 +1386,13 @@ name = "jsonrpc-pubsub" version = "18.0.0" source = "git+https://github.com/massalabs/jsonrpc#99733977df27069d64b6e1bcda7192281648fc22" dependencies = [ - "futures 0.3.24", + "futures 0.3.25", "jsonrpc-core", "lazy_static", "log", "parking_lot", "rand 0.7.3", - "serde 1.0.145", + "serde 1.0.147", ] [[package]] @@ -1391,7 +1401,7 @@ version = "18.0.0" source = "git+https://github.com/massalabs/jsonrpc#99733977df27069d64b6e1bcda7192281648fc22" dependencies = [ "bytes", - "futures 0.3.24", + "futures 0.3.25", "globset", "jsonrpc-core", "lazy_static", @@ -1404,9 +1414,12 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "lazy_static" @@ -1441,15 +1454,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.134" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if 1.0.0", "winapi", @@ -1457,9 +1470,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "librocksdb-sys" @@ -1549,7 +1562,7 @@ dependencies = [ "anyhow", "atty", "console", - "dialoguer", + "dialoguer 0.10.2 (git+https://github.com/mitsuhiko/dialoguer)", "erased-serde", "glob", "lazy_static", @@ -1560,7 +1573,7 @@ dependencies = [ "massa_wallet", "paw", "rev_lines", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "structopt", "strum", @@ -1575,7 +1588,7 @@ name = "massa-node" version = "0.1.0" dependencies = [ "anyhow", - "dialoguer", + "dialoguer 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "enum-map", "lazy_static", "massa_api", @@ -1607,7 +1620,7 @@ dependencies = [ "massa_wallet", "parking_lot", "paw", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "structopt", "tokio", @@ -1628,7 +1641,7 @@ dependencies = [ "loupe", "parking_lot", "rand 0.8.5", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "serial_test 0.8.0", "wasmer", @@ -1661,7 +1674,7 @@ dependencies = [ "massa_time", "massa_wallet", "parking_lot", - "serde 1.0.145", + "serde 1.0.147", "thiserror", "tokio", "tracing", @@ -1672,7 +1685,7 @@ name = "massa_async_pool" version = "0.1.0" dependencies = [ "displaydoc", - "futures 0.3.24", + "futures 0.3.25", "lazy_static", "massa_hash", "massa_logging", @@ -1684,7 +1697,7 @@ dependencies = [ "num", "pretty_assertions", "rand 0.8.5", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "serial_test 0.9.0", "thiserror", @@ -1698,7 +1711,7 @@ dependencies = [ "async-speed-limit", "bitvec", "displaydoc", - "futures 0.3.24", + "futures 0.3.25", "lazy_static", "massa_async_pool", "massa_consensus_exports", @@ -1720,7 +1733,7 @@ dependencies = [ "num_enum", "parking_lot", "rand 0.8.5", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "serial_test 0.9.0", "tempfile", @@ -1739,7 +1752,7 @@ dependencies = [ "pbkdf2", "rand 0.8.5", "rand_core 0.6.4", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "serde_qs", "thiserror", @@ -1867,7 +1880,7 @@ dependencies = [ "massa_time", "nom 7.1.1", "num", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "thiserror", "tracing", @@ -1891,7 +1904,7 @@ dependencies = [ "massa_time", "massa_wallet", "parking_lot", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "serial_test 0.9.0", "tracing", @@ -1930,7 +1943,7 @@ dependencies = [ "massa_storage", "nom 7.1.1", "num", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "thiserror", "tracing", @@ -1945,7 +1958,7 @@ dependencies = [ "displaydoc", "massa_serialization", "nom 7.1.1", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "serial_test 0.9.0", "thiserror", @@ -1961,7 +1974,7 @@ dependencies = [ "massa_serialization", "massa_signature", "nom 7.1.1", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "tempfile", "thiserror", @@ -2010,7 +2023,7 @@ dependencies = [ "num", "num_enum", "rust_decimal", - "serde 1.0.145", + "serde 1.0.147", "serial_test 0.9.0", "thiserror", ] @@ -2027,7 +2040,7 @@ dependencies = [ "massa_signature", "massa_time", "nom 7.1.1", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "tempfile", "thiserror", @@ -2040,7 +2053,7 @@ name = "massa_network_worker" version = "0.1.0" dependencies = [ "enum-map", - "futures 0.3.24", + "futures 0.3.25", "itertools", "massa_hash", "massa_logging", @@ -2052,7 +2065,7 @@ dependencies = [ "nom 7.1.1", "num_enum", "rand 0.8.5", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "serial_test 0.9.0", "tempfile", @@ -2067,7 +2080,7 @@ dependencies = [ "massa_models", "massa_storage", "massa_time", - "serde 1.0.145", + "serde 1.0.147", ] [[package]] @@ -2101,7 +2114,7 @@ dependencies = [ "nom 7.1.1", "num", "parking_lot", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "thiserror", "tokio", @@ -2123,7 +2136,7 @@ dependencies = [ "rand 0.8.5", "rand_distr", "rand_xoshiro", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "tracing", ] @@ -2133,7 +2146,7 @@ name = "massa_protocol_exports" version = "0.1.0" dependencies = [ "displaydoc", - "futures 0.3.24", + "futures 0.3.25", "lazy_static", "massa_hash", "massa_logging", @@ -2142,7 +2155,7 @@ dependencies = [ "massa_signature", "massa_storage", "massa_time", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "thiserror", "tokio", @@ -2153,7 +2166,7 @@ dependencies = [ name = "massa_protocol_worker" version = "0.1.0" dependencies = [ - "futures 0.3.24", + "futures 0.3.25", "lazy_static", "massa_hash", "massa_logging", @@ -2178,7 +2191,7 @@ version = "0.1.0" dependencies = [ "jsonrpc-core-client", "massa_models", - "serde 1.0.145", + "serde 1.0.147", "tokio", ] @@ -2203,7 +2216,7 @@ dependencies = [ "massa_serialization", "nom 7.1.1", "rand 0.7.3", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "serial_test 0.9.0", "thiserror", @@ -2229,7 +2242,7 @@ dependencies = [ "displaydoc", "massa_serialization", "nom 7.1.1", - "serde 1.0.145", + "serde 1.0.147", "thiserror", "time", ] @@ -2243,7 +2256,7 @@ dependencies = [ "massa_hash", "massa_models", "massa_signature", - "serde 1.0.145", + "serde 1.0.147", "serde_json", "serde_qs", "tempfile", @@ -2258,9 +2271,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498" +checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" dependencies = [ "libc", ] @@ -2303,14 +2316,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] @@ -2321,9 +2334,9 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "native-tls" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -2339,9 +2352,9 @@ dependencies = [ [[package]] name = "net2" -version = "0.2.37" +version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" dependencies = [ "cfg-if 0.1.10", "libc", @@ -2402,7 +2415,7 @@ dependencies = [ "autocfg", "num-integer", "num-traits 0.2.15", - "serde 1.0.145", + "serde 1.0.147", ] [[package]] @@ -2412,7 +2425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" dependencies = [ "num-traits 0.2.15", - "serde 1.0.145", + "serde 1.0.147", ] [[package]] @@ -2446,7 +2459,7 @@ dependencies = [ "num-bigint", "num-integer", "num-traits 0.2.15", - "serde 1.0.145", + "serde 1.0.147", ] [[package]] @@ -2470,9 +2483,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ "hermit-abi", "libc", @@ -2499,15 +2512,6 @@ dependencies = [ "syn", ] -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - [[package]] name = "object" version = "0.28.4" @@ -2531,9 +2535,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "opaque-debug" @@ -2575,9 +2579,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.76" +version = "0.9.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" +checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" dependencies = [ "autocfg", "cc", @@ -2613,9 +2617,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -2624,7 +2628,7 @@ dependencies = [ "redox_syscall", "smallvec", "thread-id", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] @@ -2671,7 +2675,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "hmac", "password-hash", "sha2 0.10.6", @@ -2713,9 +2717,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "polyval" @@ -2731,9 +2735,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty_assertions" @@ -2793,9 +2797,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ "unicode-ident", ] @@ -2894,7 +2898,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", ] [[package]] @@ -2964,7 +2968,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "redox_syscall", "thiserror", ] @@ -2982,9 +2986,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -2993,9 +2997,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "region" @@ -3082,7 +3086,7 @@ checksum = "ee9164faf726e4f3ece4978b25ca877ddc6802fa77f38cdccb32c7f805ecd70c" dependencies = [ "arrayvec 0.7.2", "num-traits 0.2.15", - "serde 1.0.145", + "serde 1.0.147", ] [[package]] @@ -3177,9 +3181,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" dependencies = [ "serde_derive", ] @@ -3202,14 +3206,14 @@ version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" dependencies = [ - "serde 1.0.145", + "serde 1.0.147", ] [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", @@ -3218,13 +3222,13 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" dependencies = [ "itoa", "ryu", - "serde 1.0.145", + "serde 1.0.147", ] [[package]] @@ -3234,7 +3238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" dependencies = [ "percent-encoding", - "serde 1.0.145", + "serde 1.0.147", "thiserror", ] @@ -3244,7 +3248,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eec42e7232e5ca56aa59d63af3c7f991fe71ee6a3ddd2d3480834cf3902b007" dependencies = [ - "futures 0.3.24", + "futures 0.3.25", "lazy_static", "log", "parking_lot", @@ -3258,7 +3262,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92761393ee4dc3ff8f4af487bd58f4307c9329bbedea02cac0089ad9c411e153" dependencies = [ "dashmap", - "futures 0.3.24", + "futures 0.3.25", "lazy_static", "log", "parking_lot", @@ -3311,7 +3315,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -3439,9 +3443,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" dependencies = [ "proc-macro2", "quote", @@ -3468,9 +3472,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1" +checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" [[package]] name = "tempfile" @@ -3556,14 +3560,29 @@ dependencies = [ [[package]] name = "time" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ "itoa", - "libc", - "num_threads", - "serde 1.0.145", + "serde 1.0.147", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", ] [[package]] @@ -3609,9 +3628,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" dependencies = [ "futures-core", "pin-project-lite", @@ -3638,18 +3657,25 @@ version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ - "serde 1.0.145", + "serde 1.0.147", ] +[[package]] +name = "toml_datetime" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808b51e57d0ef8f71115d8f3a01e7d3750d01c79cac4b3eda910f4389fdf92fd" + [[package]] name = "toml_edit" -version = "0.14.4" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f" +checksum = "b1541ba70885967e662f69d31ab3aeca7b1aaecfcd58679590b893e9239c3646" dependencies = [ "combine", "indexmap", "itertools", + "toml_datetime", ] [[package]] @@ -3740,9 +3766,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "unicode-segmentation" @@ -3882,9 +3908,9 @@ checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "wasm-encoder" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64ac98d5d61192cc45c701b7e4bd0b9aff91e2edfc7a088406cfe2288581e2c" +checksum = "9424cdab516a16d4ea03c8f4a01b14e7b2d04a129dcc2bcdde5bcc5f68f06c41" dependencies = [ "leb128", ] @@ -3938,7 +3964,7 @@ dependencies = [ "enumset", "loupe", "rkyv", - "serde 1.0.145", + "serde 1.0.147", "serde_bytes", "smallvec", "target-lexicon", @@ -4011,7 +4037,7 @@ dependencies = [ "memmap2", "more-asserts", "rustc-demangle", - "serde 1.0.145", + "serde 1.0.147", "serde_bytes", "target-lexicon", "thiserror", @@ -4035,7 +4061,7 @@ dependencies = [ "loupe", "object 0.28.4", "rkyv", - "serde 1.0.145", + "serde 1.0.147", "tempfile", "tracing", "wasmer-artifact", @@ -4119,7 +4145,7 @@ dependencies = [ "loupe", "more-asserts", "rkyv", - "serde 1.0.145", + "serde 1.0.147", "thiserror", ] @@ -4144,7 +4170,7 @@ dependencies = [ "region", "rkyv", "scopeguard", - "serde 1.0.145", + "serde 1.0.147", "thiserror", "wasmer-artifact", "wasmer-types", @@ -4159,9 +4185,9 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wast" -version = "47.0.1" +version = "49.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b98502f3978adea49551e801a6687678e6015317d7d9470a67fe813393f2a8" +checksum = "05ef81fcd60d244cafffeafac3d17615fdb2fddda6aca18f34a8ae233353587c" dependencies = [ "leb128", "memchr", @@ -4171,9 +4197,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.49" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aab4e20c60429fbba9670a6cae0fff9520046ba0aa3e6d0b1cd2653bea14898" +checksum = "4c347c4460ffb311e95aafccd8c29e4888f241b9e4b3bb0e0ccbd998de2c8c0d" dependencies = [ "wast", ] @@ -4237,6 +4263,27 @@ dependencies = [ "windows_x86_64_msvc 0.36.1", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + [[package]] name = "windows_aarch64_msvc" version = "0.33.0" @@ -4249,6 +4296,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + [[package]] name = "windows_i686_gnu" version = "0.33.0" @@ -4261,6 +4314,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + [[package]] name = "windows_i686_msvc" version = "0.33.0" @@ -4273,6 +4332,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + [[package]] name = "windows_x86_64_gnu" version = "0.33.0" @@ -4285,6 +4350,18 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + [[package]] name = "windows_x86_64_msvc" version = "0.33.0" @@ -4297,11 +4374,17 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + [[package]] name = "wyz" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] diff --git a/README.md b/README.md index ec7f6d6c6f5..36a1e13ea51 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ An easy-to-read blog post introduction with videos is written We are now releasing the **Massa testnet** in this GitHub repository, with its explorer available at . -You can interact with Massa JSON-RPC public API on [OpenRPC Playground](https://playground.open-rpc.org/?schemaUrl=https://test.massa.net/api/v2&uiSchema\[appBar\]\[ui:input\]=false&uiSchema\[appBar\]\[ui:inputPlaceholder\]=Enter+Massa+JSON-RPC+server+URL&uiSchema\[appBar\]\[ui:logoUrl\]=https://massa.net/favicons/favicon.ico&uiSchema\[appBar\]\[ui:splitView\]=false&uiSchema\[appBar\]\[ui:darkMode\]=false&uiSchema\[appBar\]\[ui:title\]=Massa&uiSchema\[appBar\]\[ui:examplesDropdown\]=false&uiSchema\[methods\]\[ui:defaultExpanded\]=false&uiSchema\[methods\]\[ui:methodPlugins\]=true&uiSchema\[params\]\[ui:defaultExpanded\]=false)which is an equivalent of SwaggerUI for OpenAPI specifications. +You can interact with Massa JSON-RPC public API on [OpenRPC Playground](https://playground.open-rpc.org/?schemaUrl=https://test.massa.net/api/v2&uiSchema\[appBar\]\[ui:input\]=false&uiSchema\[appBar\]\[ui:inputPlaceholder\]=Enter+Massa+JSON-RPC+server+URL&uiSchema\[appBar\]\[ui:logoUrl\]=https://massa.net/favicons/favicon.ico&uiSchema\[appBar\]\[ui:splitView\]=false&uiSchema\[appBar\]\[ui:darkMode\]=false&uiSchema\[appBar\]\[ui:title\]=Massa&uiSchema\[appBar\]\[ui:examplesDropdown\]=false&uiSchema\[methods\]\[ui:defaultExpanded\]=false&uiSchema\[methods\]\[ui:methodPlugins\]=true&uiSchema\[params\]\[ui:defaultExpanded\]=false) which is an equivalent of SwaggerUI for OpenAPI specifications. ## Testnet Incentives diff --git a/massa-client/Cargo.toml b/massa-client/Cargo.toml index 06093192686..2d7ccbfb65d 100644 --- a/massa-client/Cargo.toml +++ b/massa-client/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" anyhow = "1.0" atty = "0.2" console = "0.15" -dialoguer = { version = "0.10", features = ["history", "completion"] } +dialoguer = { git = "https://github.com/mitsuhiko/dialoguer", features = ["history", "completion"] } erased-serde = "0.3" glob = "0.3" lazy_static = "1.4" @@ -32,5 +32,5 @@ massa_wallet = { path = "../massa-wallet" } tilde-expand = "0.1" [dev-dependencies] -toml_edit = "0.14" +toml_edit = "0.15" diff --git a/massa-models/src/api.rs b/massa-models/src/api.rs index b8842d8cea2..ba3433facc0 100644 --- a/massa-models/src/api.rs +++ b/massa-models/src/api.rs @@ -81,11 +81,16 @@ impl std::fmt::Display for NodeStatus { writeln!(f)?; writeln!(f, "{}", self.consensus_stats)?; - //TODO: https://github.com/massalabs/massa/issues/2870 - //writeln!(f, "{}", self.pool_stats)?; + + writeln!(f, "Pool stats:")?; + writeln!(f, "\tOperations count: {}", self.pool_stats.0)?; + writeln!(f, "\tEndorsements count: {}", self.pool_stats.1)?; + writeln!(f)?; writeln!(f, "{}", self.network_stats)?; + writeln!(f, "{}", self.execution_stats)?; + writeln!(f, "Connected nodes:")?; for (node_id, (ip_addr, is_outgoing)) in &self.connected_nodes { writeln!( @@ -248,13 +253,22 @@ impl std::fmt::Display for AddressInfo { "\tBalance: final={}, candidate={}", self.final_balance, self.candidate_balance )?; - writeln!(f, "\tLocked coins:")?; - for slot_amount in &self.deferred_credits { - writeln!( - f, - "\t\t{} locked coins will be unlocked at slot {}", - slot_amount.amount, slot_amount.slot - )?; + writeln!( + f, + "\tRolls: final={}, candidate={}", + self.final_roll_count, self.candidate_roll_count + )?; + write!(f, "\tLocked coins:")?; + if self.deferred_credits.is_empty() { + writeln!(f, "0")?; + } else { + for slot_amount in &self.deferred_credits { + writeln!( + f, + "\t\t{} locked coins will be unlocked at slot {}", + slot_amount.amount, slot_amount.slot + )?; + } } writeln!(f, "\tCycle infos:")?; for cycle_info in &self.cycle_infos { diff --git a/massa-models/src/config/compact_config.rs b/massa-models/src/config/compact_config.rs index e500282a925..fb5c47de1e8 100644 --- a/massa-models/src/config/compact_config.rs +++ b/massa-models/src/config/compact_config.rs @@ -67,6 +67,7 @@ impl Display for CompactConfig { writeln!(f, " Periods per cycle: {}", self.periods_per_cycle)?; writeln!(f, " Block reward: {}", self.block_reward)?; writeln!(f, " Periods per cycle: {}", self.periods_per_cycle)?; + writeln!(f, " Roll price: {}", self.roll_price)?; writeln!(f, " Max block size (in bytes): {}", self.max_block_size)?; Ok(()) } diff --git a/massa-models/src/config/constants.rs b/massa-models/src/config/constants.rs index a05bd3a9bd7..45ab2ed08cf 100644 --- a/massa-models/src/config/constants.rs +++ b/massa-models/src/config/constants.rs @@ -64,7 +64,7 @@ lazy_static::lazy_static! { if cfg!(feature = "sandbox") { "SAND.0.0" } else { - "TEST.16.0" + "TEST.16.1" } .parse() .unwrap() diff --git a/massa-node/base_config/openrpc.json b/massa-node/base_config/openrpc.json index 15c7957a36c..27d8968bc2b 100644 --- a/massa-node/base_config/openrpc.json +++ b/massa-node/base_config/openrpc.json @@ -2,7 +2,7 @@ "openrpc": "1.2.4", "info": { "title": "Massa OpenRPC Specification", - "version": "TEST.16.0", + "version": "TEST.16.1", "description": "Massa OpenRPC Specification document. Find more information on https://docs.massa.net/en/latest/technical-doc/api.html", "termsOfService": "https://open-rpc.org", "contact": { @@ -125,7 +125,9 @@ { "name": "blockId", "description": "Block ID", - "schema": false, + "schema": { + "$ref": "#/components/schemas/BlockId" + }, "summary": "string", "required": true } @@ -153,7 +155,7 @@ "description": "Slot of the block", "schema": { "type": "object", - "$ref": "#/components/schemas/ExecutedAt" + "$ref": "#/components/schemas/Slot" }, "required": true } @@ -923,7 +925,7 @@ "type": "object", "properties": { "header": { - "$ref": "#/components/schemas/Header", + "$ref": "#/components/schemas/WrappedHeader", "description": "signed header" }, "operations": { @@ -936,6 +938,10 @@ }, "additionalProperties": false }, + "BlockId": { + "description": "Block identifier", + "type": "string" + }, "BlockInfo": { "title": "BlockInfo", "required": [ @@ -1033,7 +1039,9 @@ "description": "The block ids of the blocks in that clique", "type": "array", "items": { - "type": "string" + "schema": { + "$ref": "#/components/schemas/BlockId" + } } }, "fitness": { @@ -1265,7 +1273,8 @@ "$ref": "#/components/schemas/EndorsementContent" }, "creator_public_key": { - "type": "string" + "$ref": "#/components/schemas/PublicKey", + "description": "the content creator public key" }, "creator_address": { "type": "string" @@ -1382,7 +1391,8 @@ "required": [ "executed_at", "output_events", - "result" + "result", + "gas_cost" ], "type": "object", "properties": { @@ -1396,8 +1406,12 @@ "output_events": { "type": "array", "items": { - "$ref": "#/components/schemas/OutputEvent" + "$ref": "#/components/schemas/SCOutputEvent" } + }, + "gas_cost": { + "description": "The gas cost for the execution", + "type": "number" } }, "additionalProperties": false @@ -1508,6 +1522,52 @@ } } }, + "EventExecutionContext" : { + "title": "EventExecutionContext", + "description": "Context of the event (not generated by the user)", + "required": [ + "call_stack", + "index_in_slot", + "read_only", + "slot", + "is_final" + ], + "type": "object", + "properties": { + "slot": { + "$ref": "#/components/schemas/Slot", + "description": "When was it generated" + }, + "block": { + "$ref": "#/components/schemas/BlockId", + "description": "Block Id" + }, + "read_only": { + "description": "Wether the event was generated during read only call", + "type": "boolean" + }, + "call_stack": { + "description": "Addresses, most recent at the end", + "type": "array", + "items": { + "$ref": "#/components/schemas/Address" + } + }, + "index_in_slot": { + "description": "Index of the event in the slot", + "type": "number" + }, + "origin_operation_id": { + "$ref": "#/components/schemas/OperationId", + "description": "Origin operation id" + }, + "is_final": { + "description": "Whether the event is final", + "type": "boolean" + } + }, + "additionalProperties": false + }, "GraphInterval": { "title": "GraphInterval", "required": [ @@ -1746,7 +1806,7 @@ "type": "boolean" }, "operation": { - "$ref": "#/components/schemas/SignedOperation", + "$ref": "#/components/schemas/WrappedOperation", "description": "The operation itself" } }, @@ -1762,8 +1822,8 @@ "type": "object", "properties": { "creator_public_key": { - "description": "The public key of the creator of the TX", - "type": "string" + "$ref": "#/components/schemas/PublicKey", + "description": "the content creator public key" }, "signature": { "$ref": "#/components/schemas/Signature", @@ -1780,22 +1840,31 @@ }, "additionalProperties": false }, - "OutputEvent": { - "title": "OutputEvent", - "required": [ - "context", - "data" - ], + "OperationType": { + "description": "Type specific operation content.", "type": "object", "properties": { - "context": { - "$ref": "#/components/schemas/SCOEContext" + "Transaction": { + "$ref": "#/components/schemas/Transaction", + "description": "transfer coins from sender to recipient" }, - "data": { - "type": "string" + "ExecutSC": { + "$ref": "#/components/schemas/ExecuteSC", + "description": "Execute a smart contract." + }, + "CallSC": { + "$ref": "#/components/schemas/CallSC", + "description": "Calls an exported function from a stored smart contract" + }, + "RollBuy": { + "$ref": "#/components/schemas/RollBuy", + "description": "the sender buys `roll_count` rolls. Roll price is defined in configuration" + }, + "RollSell": { + "$ref": "#/components/schemas/RollSell", + "description": "the sender sells `roll_count` rolls. Roll price is defined in configuration" } - }, - "additionalProperties": false + } }, "PoolStats": { "title": "PoolStats", @@ -1844,6 +1913,10 @@ }, "additionalProperties": false }, + "PublicKey": { + "description": "Public key used to check if a message was encoded by the corresponding `PublicKey`.\nGenerated from the `KeyPair` using `SignatureEngine`", + "type": "string" + }, "PubkeySig": { "description": "Public key and a signature it has produced used for serialization/deserialization purpose", "required": [ @@ -1948,6 +2021,19 @@ }, "additionalProperties": false }, + "RollBuy": { + "description": "the sender buys `roll_count` rolls. Roll price is defined in configuration", + "required": [ + "roll_count" + ], + "type": "object", + "properties": { + "roll_count": { + "description": "roll count", + "type": "number" + } + } + }, "RollsInfo": { "title": "Rolls", "required": [ @@ -1969,41 +2055,18 @@ }, "additionalProperties": false }, - "SCContext": { - "title": "Context", + "RollSell": { + "description": "the sender sells `roll_count` rolls. Roll price is defined in configuration", "required": [ - "block", - "call_stack", - "index_in_slot", - "origin_operation_id", - "read_only", - "slot" + "roll_count" ], "type": "object", "properties": { - "slot": { - "$ref": "#/components/schemas/Slot" - }, - "block": { - "type": "string" - }, - "read_only": { - "type": "boolean" - }, - "call_stack": { - "type": "array", - "items": { - "type": "string" - } - }, - "index_in_slot": { - "type": "integer" - }, - "origin_operation_id": { - "type": "string" + "roll_count": { + "description": "roll count", + "type": "number" } - }, - "additionalProperties": false + } }, "SCOEContext": { "title": "SCOEContext", @@ -2016,7 +2079,7 @@ "type": "object", "properties": { "slot": { - "$ref": "#/components/schemas/ExecutedAt" + "$ref": "#/components/schemas/Slot" }, "block": { "description": "Block Id", @@ -2047,8 +2110,7 @@ "title": "SCOutputEvent", "required": [ "context", - "data", - "id" + "data" ], "type": "object", "properties": { @@ -2056,42 +2118,17 @@ "description": "String of the event you sended", "type": "string" }, - "id": { - "type": "string" - }, "context": { - "$ref": "#/components/schemas/SCContext" + "$ref": "#/components/schemas/EventExecutionContext", + "description": "Context generated by the execution context" } }, - "additionalProperties": false, - "example": "Id of the event" + "additionalProperties": false }, "Signature": { "description": "Signature generated from a message and a `KeyPair`.", "type": "string" }, - "SignedOperation": { - "title": "SignedOperation", - "description": "Signed Operation", - "required": [ - "creator_public_key", - "serialized_content", - "signature" - ], - "type": "object", - "properties": { - "creator_public_key": { - "type": "string" - }, - "content": { - "type": "string" - }, - "signature": { - "type": "string" - } - }, - "additionalProperties": false - }, "Slot": { "title": "TSlot", "description": "Slot", @@ -2171,6 +2208,62 @@ "type": "number" } } + }, + "WrappedHeader": { + "description": "signed operation", + "required": [ + "content", + "signature", + "creator_public_key", + "creator_address" + ], + "type": "object", + "properties": { + "content": { + "$ref": "#/components/schemas/Header", + "description": "header type" + }, + "signature": { + "$ref": "#/components/schemas/Signature", + "description": "signature" + }, + "creator_public_key": { + "$ref": "#/components/schemas/PublicKey", + "description": "the content creator public key" + }, + "creator_address": { + "$ref": "#/components/schemas/Address", + "description": "the content creator address" + } + } + }, + "WrappedOperation": { + "description": "signed operation", + "required": [ + "content", + "signature", + "creator_public_key", + "creator_address" + ], + "type": "object", + "properties": { + "content": { + "$ref": "#/components/schemas/OperationType", + "description": "operation type" + }, + "signature": { + "$ref": "#/components/schemas/Signature", + "description": "signature" + }, + "creator_public_key": { + "$ref": "#/components/schemas/PublicKey", + "description": "the content creator public key" + }, + "creator_address": { + "$ref": "#/components/schemas/Address", + "description": "the content creator address" + } + } } }, "contentDescriptors": { @@ -2182,6 +2275,14 @@ "$ref": "#/components/schemas/AddressInfo" } }, + "BlockId": { + "name": "BlockId", + "summary": "BlockId", + "description": "A BlockId object", + "schema": { + "$ref": "#/components/schemas/BlockId" + } + }, "BlockInfo": { "name": "BlockInfo", "summary": "BlockInfo", @@ -2238,6 +2339,14 @@ "$ref": "#/components/schemas/ExecuteReadOnlyResponse" } }, + "EventFilter": { + "name": "EventFilter", + "summary": "EventFilter", + "description": "A EventFilter object", + "schema": { + "$ref": "#/components/schemas/EventFilter" + } + }, "GraphInterval": { "name": "GraphInterval", "summary": "GraphInterval", @@ -2278,6 +2387,14 @@ "$ref": "#/components/schemas/OperationInfo" } }, + "OperationType": { + "name": "OperationType", + "summary": "OperationType", + "description": "A OperationType object", + "schema": { + "$ref": "#/components/schemas/OperationType" + } + }, "PubkeySig": { "name": "PubkeySig", "summary": "PubkeySig", @@ -2310,14 +2427,6 @@ "$ref": "#/components/schemas/SCOutputEvent" } }, - "SignedOperation": { - "name": "SignedOperation", - "summary": "Signed operation", - "description": "A SignedOperation object", - "schema": { - "$ref": "#/components/schemas/SignedOperation" - } - }, "Staker": { "name": "Staker", "summary": "Staker",